merge/resolve conflicts(some more to do after this one)
merge in perl 5.12.2 plus local changes
perl 5.8.2 from CPAN