Integrate from mainperl.
Jarkko Hietaniemi [Wed, 12 May 1999 14:30:23 +0000 (14:30 +0000)]
p4raw-id: //depot/cfgperl@3408


Trivial merge