Integrate mainline
Nick Ing-Simmons [Sat, 4 Nov 2000 23:40:44 +0000 (23:40 +0000)]
p4raw-id: //depot/perlio@7551


Trivial merge