Integrate from mainperl.
Jarkko Hietaniemi [Thu, 11 Feb 1999 08:04:25 +0000 (08:04 +0000)]
p4raw-id: //depot/cfgperl@2861


Trivial merge