Integrate from mainperl.
Jarkko Hietaniemi [Sun, 27 Jun 1999 18:50:52 +0000 (18:50 +0000)]
p4raw-id: //depot/cfgperl@3554


Trivial merge