Integrate mainline (make test works again now).
Nick Ing-Simmons [Tue, 6 Mar 2001 20:52:37 +0000 (20:52 +0000)]
p4raw-id: //depot/perlio@9060


Trivial merge