Merge branch 'pkgsrc_2013Q2' into joyent/feature/sngl/2013Q2
Ugly hack to get postfix building for now.
Merge branch 'joyent/feature/sngl/2013Q2' into joyent/release/2013Q2_sngl