Integrate mainline
Nick Ing-Simmons [Sun, 19 Nov 2000 11:19:39 +0000 (11:19 +0000)]
p4raw-id: //depot/perlio@7747


Trivial merge