Integrate mainline
Nick Ing-Simmons [Mon, 27 May 2002 18:47:58 +0000 (18:47 +0000)]
p4raw-id: //depot/perlio@16818


Trivial merge