Integrate mainline (for s/y/m as sub names stuff).
Nick Ing-Simmons [Fri, 1 Dec 2000 22:49:43 +0000 (22:49 +0000)]
p4raw-id: //depot/perlio@7948


Trivial merge