Integrate perlio #18040 and #18043 (no real changes;
Jarkko Hietaniemi [Mon, 13 Jan 2003 02:38:33 +0000 (02:38 +0000)]
some whitespace changes but ignored them so that Dan's
version of Encode wins)

p4raw-id: //depot/perl@18473


Trivial merge