Integrate mainline
Nick Ing-Simmons [Fri, 31 May 2002 08:39:37 +0000 (08:39 +0000)]
p4raw-id: //depot/perlio@16919


Trivial merge