Integrate mainline
Nick Ing-Simmons [Mon, 26 May 2003 15:51:53 +0000 (15:51 +0000)]
p4raw-id: //depot/perlio@19624


Trivial merge