Integrate mainline (run/switchd.t fails).
Nick Ing-Simmons [Fri, 2 May 2003 13:37:08 +0000 (13:37 +0000)]
p4raw-id: //depot/perlio@19379


Trivial merge