Integrate mainline. (Builds but does not work - something broke pipes...)
Nick Ing-Simmons [Wed, 10 Jan 2001 19:23:13 +0000 (19:23 +0000)]
p4raw-id: //depot/perlio@8392


Trivial merge