Integrate mainline
Nick Ing-Simmons [Thu, 30 May 2002 15:55:46 +0000 (15:55 +0000)]
p4raw-id: //depot/perlio@16898


Trivial merge