Merge branch 'pkgsrc_2014Q2' into joyent/feature/multiarch/2014Q2
Merge branch 'pkgsrc_2014Q2' into joyent/feature/multiarch/2014Q2
lang/perl5: Fix packlists in non-multiarch case.
Merge branch 'joyent/feature/multiarch/2014Q2' into joyent/release/2014Q2_multiarch