Integrate mainline ...
Nick Ing-Simmons [Mon, 13 Nov 2000 20:21:57 +0000 (20:21 +0000)]
p4raw-id: //depot/perlio@7675


Trivial merge