Merge branch 'pkgsrc_2013Q2' into joyent/feature/gccruntime/2013Q2

Conflicts:
	textproc/ruby-libxml/Makefile
Merge branch 'pkgsrc_2013Q2' into joyent/feature/miscfix/2013Q2
Merge branch 'pkgsrc_2013Q2' into joyent/feature/pbulkmulti/2013Q2
Merge branch 'pkgsrc_2013Q2' into joyent/feature/smf/2013Q2
Merge branch 'joyent/feature/gccruntime/2013Q2' into joyent/release/2013Q2
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2
Merge branch 'joyent/feature/pbulkmulti/2013Q2' into joyent/release/2013Q2
Merge branch 'joyent/feature/smf/2013Q2' into joyent/release/2013Q2