Integrate mainline.
Nick Ing-Simmons [Wed, 9 May 2001 18:37:56 +0000 (18:37 +0000)]
p4raw-id: //depot/perlio@10057


Trivial merge