Integrate mainline.
Nick Ing-Simmons [Wed, 6 Jun 2001 08:59:51 +0000 (08:59 +0000)]
p4raw-id: //depot/perlio@10452


Trivial merge