Integrate mainline (Works again)
Nick Ing-Simmons [Sun, 16 Feb 2003 10:40:30 +0000 (10:40 +0000)]
p4raw-id: //depot/perlio@18719


Trivial merge