Integrate mainline.
authorNick Ing-Simmons <nik@tiuk.ti.com>
Wed, 17 Jan 2001 20:40:20 +0000 (20:40 +0000)
committerNick Ing-Simmons <nik@tiuk.ti.com>
Wed, 17 Jan 2001 20:40:20 +0000 (20:40 +0000)
p4raw-id: //depot/perlio@8466


Trivial merge