Integrate mainline.
Nick Ing-Simmons [Sun, 22 Apr 2001 20:40:31 +0000 (20:40 +0000)]
p4raw-id: //depot/perlio@9780


Trivial merge