Integrate from mainperl.
Jarkko Hietaniemi [Fri, 5 Mar 1999 12:49:01 +0000 (12:49 +0000)]
p4raw-id: //depot/cfgperl@3088


Trivial merge