Merge branch 'joyent/feature/multiarch/2012Q4' into joyent/release/2012Q4_multiarch

Conflicts:
	databases/postgresql91/Makefile.common
	databases/postgresql92/Makefile.common
	databases/tokyotyrant/Makefile
	graphics/netpbm/Makefile
	lang/gcc47/Makefile
	lang/tcl/Makefile
	mk/install/install.mk
	multimedia/xvidcore/Makefile
	net/libfetch/Makefile
	security/openssl/distinfo
	security/openssl/patches/patch-af
	textproc/py-cElementTree/Makefile
	textproc/py-libxml2/Makefile
Fix merge botch.