Integrate with Sarathy.
Jarkko Hietaniemi [Thu, 4 May 2000 15:30:16 +0000 (15:30 +0000)]
p4raw-id: //depot/cfgperl@6060


Trivial merge