devel/libuuid: fix merge
lang/lua51: fix merge
lang/perl5: fix merge
Merge branch 'joyent/feature/multiarch/trunk' into joyent/release/trunk