Integrate from mainperl.
Jarkko Hietaniemi [Wed, 3 Feb 1999 13:58:00 +0000 (13:58 +0000)]
p4raw-id: //depot/cfgperl@2806


Trivial merge