Integrate mainline.
Nick Ing-Simmons [Thu, 1 Mar 2001 23:25:30 +0000 (23:25 +0000)]
p4raw-id: //depot/perlio@8976


Trivial merge