Integrate mainline.
Nick Ing-Simmons [Tue, 23 Jan 2001 19:30:57 +0000 (19:30 +0000)]
p4raw-id: //depot/perlio@8534


Trivial merge