Merge branch 'trunk' into joyent/feature/multiarch/trunk

Conflicts:
	lang/perl5/distinfo
	lang/python27/distinfo
Merge branch 'trunk' into joyent/feature/pbulkmulti/trunk
Merge branch 'joyent/feature/multiarch/trunk' into joyent/release/trunk
Merge branch 'joyent/feature/pbulkmulti/trunk' into joyent/release/trunk
Add 'joyent' and 'wip' submodules.