Blind (untested) integrate of mainline.
Nick Ing-Simmons [Thu, 19 Apr 2001 18:53:54 +0000 (18:53 +0000)]
p4raw-id: //depot/perlio@9757


Trivial merge