Integrate mainline
Nick Ing-Simmons [Wed, 8 May 2002 17:40:34 +0000 (17:40 +0000)]
p4raw-id: //depot/perlio@16494


Trivial merge