Integrate from mainperl.
Jarkko Hietaniemi [Mon, 15 Feb 1999 14:02:21 +0000 (14:02 +0000)]
p4raw-id: //depot/cfgperl@2953


Trivial merge