Integrate from mainperl.
Jarkko Hietaniemi [Thu, 13 May 1999 14:20:17 +0000 (14:20 +0000)]
p4raw-id: //depot/cfgperl@3412


Trivial merge