Integrate from mainperl.
Jarkko Hietaniemi [Thu, 6 May 1999 07:59:52 +0000 (07:59 +0000)]
p4raw-id: //depot/cfgperl@3313


Trivial merge