Integrate mainline
Nick Ing-Simmons [Mon, 20 May 2002 10:18:26 +0000 (10:18 +0000)]
p4raw-id: //depot/perlio@16705


Trivial merge