Integrate mainline.
Nick Ing-Simmons [Sun, 29 Apr 2001 15:43:22 +0000 (15:43 +0000)]
p4raw-id: //depot/perlio@9904


Trivial merge