Integrate mainline
Nick Ing-Simmons [Thu, 16 Nov 2000 21:10:58 +0000 (21:10 +0000)]
p4raw-id: //depot/perlio@7712


Trivial merge