Integrate from mainperl.
Jarkko Hietaniemi [Sat, 28 Nov 1998 14:58:19 +0000 (14:58 +0000)]
p4raw-id: //depot/cfgperl@2350


Trivial merge