Integrate mainline
Nick Ing-Simmons [Sat, 30 Dec 2000 16:40:49 +0000 (16:40 +0000)]
p4raw-id: //depot/perlio@8266


Trivial merge