Integrate from mainperl.
Jarkko Hietaniemi [Thu, 10 Jun 1999 10:18:15 +0000 (10:18 +0000)]
p4raw-id: //depot/cfgperl@3528


Trivial merge