Integrate mainline.
Nick Ing-Simmons [Tue, 15 May 2001 08:39:14 +0000 (08:39 +0000)]
p4raw-id: //depot/perlio@10111


Trivial merge