Integrate from mainperl.
Jarkko Hietaniemi [Fri, 21 May 1999 22:00:56 +0000 (22:00 +0000)]
p4raw-id: //depot/cfgperl@3443


Trivial merge