Fix merge conflicts, remove extra files, match upstream perl-5.20.1ok deraadt@ sthen@ espie@ miod@
Perl 5.12.2 from CPAN