Integrate mainline
Nick Ing-Simmons [Fri, 17 May 2002 14:59:20 +0000 (14:59 +0000)]
p4raw-id: //depot/perlio@16655


Trivial merge