Integrate from mainperl.
Jarkko Hietaniemi [Sun, 28 Mar 1999 12:30:01 +0000 (12:30 +0000)]
p4raw-id: //depot/cfgperl@3194


Trivial merge