Integrate from mainperl.
Jarkko Hietaniemi [Tue, 17 Nov 1998 11:46:56 +0000 (11:46 +0000)]
p4raw-id: //depot/cfgperl@2247


Trivial merge