Integrate mainline
Nick Ing-Simmons [Wed, 6 Dec 2000 19:57:20 +0000 (19:57 +0000)]
p4raw-id: //depot/perlio@8020


Trivial merge