Integrate mainline.
Nick Ing-Simmons [Thu, 31 May 2001 07:52:23 +0000 (07:52 +0000)]
p4raw-id: //depot/perlio@10342


Trivial merge