Integrate mainline
Nick Ing-Simmons [Thu, 8 May 2003 14:32:17 +0000 (14:32 +0000)]
p4raw-id: //depot/perlio@19446


Trivial merge