Integrate mainline
Nick Ing-Simmons [Wed, 15 May 2002 06:57:26 +0000 (06:57 +0000)]
p4raw-id: //depot/perlio@16607


Trivial merge