Integrate mainline.
Nick Ing-Simmons [Wed, 20 Jun 2001 08:56:39 +0000 (08:56 +0000)]
p4raw-id: //depot/perlio@10745


Trivial merge