Integrate with Sarathy. h2xs.PL had to be manually resolved,
Jarkko Hietaniemi [Sun, 26 Sep 1999 11:59:18 +0000 (11:59 +0000)]
I kept my (Ilya's) version.

p4raw-id: //depot/cfgperl@4233


Trivial merge