Integrate mainline.
Nick Ing-Simmons [Tue, 20 May 2003 15:38:30 +0000 (15:38 +0000)]
p4raw-id: //depot/perlio@19572


Trivial merge