Integrate mainline
Nick Ing-Simmons [Wed, 29 May 2002 14:12:41 +0000 (14:12 +0000)]
p4raw-id: //depot/perlio@16862


Trivial merge