Re-integrate mainline
Nick Ing-Simmons [Sat, 9 Jun 2001 19:12:51 +0000 (19:12 +0000)]
p4raw-id: //depot/perlio@10488


Trivial merge