Integrate mainline (untested while modem is up)
Nick Ing-Simmons [Tue, 25 Sep 2001 19:04:36 +0000 (19:04 +0000)]
p4raw-id: //depot/perlio@12207


Trivial merge