Integrate mainline (forgot my own change...)
authorNick Ing-Simmons <nik@tiuk.ti.com>
Tue, 19 Dec 2000 21:36:16 +0000 (21:36 +0000)
committerNick Ing-Simmons <nik@tiuk.ti.com>
Tue, 19 Dec 2000 21:36:16 +0000 (21:36 +0000)
p4raw-id: //depot/perlio@8203


Trivial merge