Integrate from mainperl.
Jarkko Hietaniemi [Sun, 29 Nov 1998 10:08:15 +0000 (10:08 +0000)]
p4raw-id: //depot/cfgperl@2381


Trivial merge