Merge branch 'pkgsrc_2012Q4' into joyent/feature/miscfix/2012Q4
Merge branch 'pkgsrc_2012Q4' into joyent/feature/openssl1/2012Q4

Conflicts:
	security/openssl/Makefile
	security/openssl/distinfo
Pull security/openssl from trunk verbatim.
Merge branch 'joyent/feature/miscfix/2012Q4' into joyent/release/2012Q4
Merge branch 'joyent/feature/openssl1/2012Q4' into joyent/release/2012Q4

Conflicts:
	security/openssl/Makefile
	security/openssl/distinfo