Integrate mainline.
Nick Ing-Simmons [Sun, 25 Feb 2001 23:47:09 +0000 (23:47 +0000)]
p4raw-id: //depot/perlio@8939


Trivial merge