Integrate from mainperl.
Jarkko Hietaniemi [Mon, 18 Jan 1999 10:55:04 +0000 (10:55 +0000)]
p4raw-id: //depot/cfgperl@2641


Trivial merge