Integrate from mainperl.
Jarkko Hietaniemi [Mon, 15 Mar 1999 17:00:11 +0000 (17:00 +0000)]
p4raw-id: //depot/cfgperl@3109


Trivial merge