Merge branch 'trunk' into joyent/feature/gccruntime/trunk

Conflicts:
	net/spread/Makefile
Merge branch 'trunk' into joyent/feature/miscfix/trunk

Conflicts:
	audio/faad2/Makefile
Merge branch 'trunk' into joyent/feature/smf/trunk
Merge branch 'trunk' into joyent/feature/multiarch/trunk

Conflicts:
	devel/glib2/distinfo
	graphics/cairo-gobject/Makefile
	graphics/cairo/Makefile
	graphics/libwebp/Makefile
	lang/python26/distinfo
	lang/python27/distinfo
	security/heimdal/Makefile
Merge branch 'joyent/feature/gccruntime/trunk' into joyent/release/trunk

Conflicts:
	databases/postgresql91/Makefile.common
	databases/postgresql92/Makefile.common
	databases/tokyotyrant/Makefile
	devel/py-readline/Makefile
	graphics/netpbm/Makefile
	lang/tcl/Makefile
	multimedia/xvidcore/Makefile
	textproc/py-cElementTree/Makefile
	textproc/py-libxml2/Makefile
Merge branch 'joyent/feature/miscfix/trunk' into joyent/release/trunk

Conflicts:
	devel/libtool-base/Makefile
	devel/libtool-fortran/Makefile
	lang/gcc47/distinfo
	lang/gcc47/patches/patch-gcc_config_sol2-bi.h
Merge branch 'joyent/feature/smf/trunk' into joyent/release/trunk

Conflicts:
	mk/install/install.mk