Integrate from mainperl.
Jarkko Hietaniemi [Fri, 30 Apr 1999 11:42:14 +0000 (11:42 +0000)]
p4raw-id: //depot/cfgperl@3297


Trivial merge