Multiarch fix for lang/perl5
Merge branch 'joyent/feature/multiarch/2012Q4' into joyent/release/2012Q4_multiarch