Integrate from mainperl.
Jarkko Hietaniemi [Thu, 13 May 1999 21:18:06 +0000 (21:18 +0000)]
p4raw-id: //depot/cfgperl@3416


Trivial merge