Integrate mainline.
Nick Ing-Simmons [Sat, 20 Jan 2001 17:23:14 +0000 (17:23 +0000)]
p4raw-id: //depot/perlio@8483


Trivial merge