Integrate from mainperl.
Jarkko Hietaniemi [Mon, 17 May 1999 21:25:54 +0000 (21:25 +0000)]
p4raw-id: //depot/cfgperl@3434


Trivial merge