Integrate mainline
Nick Ing-Simmons [Wed, 1 May 2002 18:38:03 +0000 (18:38 +0000)]
p4raw-id: //depot/perlio@16313


Trivial merge