Blind integrate mainline (as of 5.7.2?)
Nick Ing-Simmons [Fri, 13 Jul 2001 14:24:06 +0000 (14:24 +0000)]
p4raw-id: //depot/perlio@11357


Trivial merge