Integrate mainline
Nick Ing-Simmons [Thu, 16 Nov 2000 07:31:49 +0000 (07:31 +0000)]
p4raw-id: //depot/perlio@7709


Trivial merge