Integrate from mainperl.
Jarkko Hietaniemi [Wed, 2 Jun 1999 21:33:28 +0000 (21:33 +0000)]
p4raw-id: //depot/cfgperl@3520


Trivial merge