Integrate from mainperl.
Jarkko Hietaniemi [Fri, 14 May 1999 07:34:20 +0000 (07:34 +0000)]
p4raw-id: //depot/cfgperl@3421


Trivial merge