Integrate mainline
Nick Ing-Simmons [Sun, 3 Dec 2000 14:43:01 +0000 (14:43 +0000)]
p4raw-id: //depot/perlio@7960


Trivial merge