Integrate mainline
Nick Ing-Simmons [Sun, 18 May 2003 08:48:17 +0000 (08:48 +0000)]
p4raw-id: //depot/perlio@19554


Trivial merge