Integrate mainline.
Nick Ing-Simmons [Fri, 10 Nov 2000 13:40:00 +0000 (13:40 +0000)]
p4raw-id: //depot/perlio@7636


Trivial merge