Integrate from mainperl.
Jarkko Hietaniemi [Sat, 31 Oct 1998 15:50:02 +0000 (15:50 +0000)]
p4raw-id: //depot/cfgperl@2164


Trivial merge