Integrate mainline (including force integrate of
Nick Ing-Simmons [Thu, 3 Jan 2002 09:19:37 +0000 (09:19 +0000)]
lib/charnames.pm which had got out-of-step)

p4raw-id: //depot/perlio@14034


Trivial merge