Integrate mainline.
authorNick Ing-Simmons <nik@tiuk.ti.com>
Fri, 15 Jun 2001 10:11:20 +0000 (10:11 +0000)
committerNick Ing-Simmons <nik@tiuk.ti.com>
Fri, 15 Jun 2001 10:11:20 +0000 (10:11 +0000)
p4raw-id: //depot/perlio@10596


Trivial merge