Integrate mainline
Nick Ing-Simmons [Tue, 28 Nov 2000 22:04:34 +0000 (22:04 +0000)]
p4raw-id: //depot/perlio@7905


Trivial merge