Update joyent and wip submodules
Merge branch 'joyent/release/2013Q1' of github.com:joyent/pkgsrc into joyent/release/2013Q1