Integrate mainline.
Nick Ing-Simmons [Wed, 4 Apr 2001 18:44:00 +0000 (18:44 +0000)]
p4raw-id: //depot/perlio@9546


Trivial merge