Integrate from mainperl.
Jarkko Hietaniemi [Fri, 4 Dec 1998 16:39:21 +0000 (16:39 +0000)]
p4raw-id: //depot/cfgperl@2449


Trivial merge