Merge branch 'pkgsrc_2012Q4' into joyent/feature/openssl1/2012Q4
Update master site.
Merge branch 'joyent/feature/openssl1/2012Q4' into joyent/release/2012Q4
Update 'joyent' submodule