Blind integrate of mainline
Nick Ing-Simmons [Fri, 12 Oct 2001 15:30:01 +0000 (15:30 +0000)]
p4raw-id: //depot/perlio@12409


Trivial merge