Integrate mainline.
Nick Ing-Simmons [Sun, 27 Apr 2003 18:49:03 +0000 (18:49 +0000)]
p4raw-id: //depot/perlio@19352


Trivial merge