Integrate from mainperl.
Jarkko Hietaniemi [Fri, 28 May 1999 07:39:17 +0000 (07:39 +0000)]
p4raw-id: //depot/cfgperl@3489


Trivial merge