Integrate mainline
Nick Ing-Simmons [Thu, 30 May 2002 14:39:19 +0000 (14:39 +0000)]
p4raw-id: //depot/perlio@16894


Trivial merge