Integrate from mainperl.
Jarkko Hietaniemi [Thu, 17 Jun 1999 20:00:16 +0000 (20:00 +0000)]
p4raw-id: //depot/cfgperl@3541


Trivial merge