Integrate mainline
Nick Ing-Simmons [Sun, 12 Nov 2000 19:09:41 +0000 (19:09 +0000)]
p4raw-id: //depot/perlio@7655


Trivial merge