Merge branch 'joyent/feature/miscfix/trunk' into joyent/release/trunk
Merge branch 'joyent/feature/multiarch/trunk' into joyent/release/trunk

Conflicts:
	databases/postgresql91/Makefile.common
	databases/postgresql92/Makefile.common
	databases/tokyotyrant/Makefile
	graphics/netpbm/Makefile
	lang/gcc47/Makefile
	lang/tcl/Makefile
	multimedia/xvidcore/Makefile
	net/libfetch/Makefile
	textproc/py-cElementTree/Makefile
Merge branch 'joyent/feature/smf/trunk' into joyent/release/trunk

Conflicts:
	mk/install/install.mk