Integrate mainline
Nick Ing-Simmons [Mon, 12 May 2003 17:57:45 +0000 (17:57 +0000)]
p4raw-id: //depot/perlio@19501


Trivial merge