Integrate mainline
Nick Ing-Simmons [Wed, 22 Nov 2000 21:05:06 +0000 (21:05 +0000)]
p4raw-id: //depot/perlio@7805


Trivial merge