Merge branch 'joyent/release/2013Q4' of github.com:pentandra/pkgsrc into joyent/release/2013Q4
Fixed bad submodule init