Integrate mainline
Nick Ing-Simmons [Tue, 21 Nov 2000 21:59:40 +0000 (21:59 +0000)]
p4raw-id: //depot/perlio@7798


Trivial merge