Integrate from mainperl.
Jarkko Hietaniemi [Mon, 15 Feb 1999 13:23:52 +0000 (13:23 +0000)]
p4raw-id: //depot/cfgperl@2948


Trivial merge