Integrate mainline (forgot my own change...)
Nick Ing-Simmons [Tue, 19 Dec 2000 21:36:16 +0000 (21:36 +0000)]
p4raw-id: //depot/perlio@8203


Trivial merge