Integrate mainline
Nick Ing-Simmons [Thu, 23 Nov 2000 08:05:07 +0000 (08:05 +0000)]
p4raw-id: //depot/perlio@7830


Trivial merge