Integrate from mainperl.
Jarkko Hietaniemi [Fri, 12 Feb 1999 08:52:14 +0000 (08:52 +0000)]
p4raw-id: //depot/cfgperl@2886


Trivial merge