Merge branch 'pkgsrc_2012Q4' into joyent/feature/multiarch/2012Q4
Merge branch 'pkgsrc_2012Q4' into joyent/feature/multiarch/2012Q4
Convert print/cups to multiarch.
Merge branch 'joyent/feature/multiarch/2012Q4' into joyent/release/2012Q4_multiarch