Integrate mainline
Nick Ing-Simmons [Sun, 2 Feb 2003 11:37:57 +0000 (11:37 +0000)]
p4raw-id: //depot/perlio@18620


Trivial merge