Integrate mainline (autouse works again.)
Nick Ing-Simmons [Wed, 30 May 2001 08:23:02 +0000 (08:23 +0000)]
p4raw-id: //depot/perlio@10309


Trivial merge