Integrate mainline.
Nick Ing-Simmons [Fri, 18 May 2001 07:23:03 +0000 (07:23 +0000)]
p4raw-id: //depot/perlio@10154


Trivial merge