Integrate with Sarathy; unfortunately Sarathy's whitespace
Jarkko Hietaniemi [Mon, 1 May 2000 17:45:14 +0000 (17:45 +0000)]
adjustments in 6032 conflicted badly with this, will have
to revisit them later.

p4raw-id: //depot/cfgperl@6034


Trivial merge