Merge branch 'joyent/feature/pbulkmulti/2013Q2' into joyent/release/2013Q2_multiarch
Merge branch 'joyent/feature/pbulkmulti/2013Q2' into joyent/release/2013Q2_multiarch
Merge branch 'joyent/release/2013Q2' into joyent/release/2013Q2_multiarch
Update joyent
Update joyent
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2

Conflicts:
	net/spread/Makefile
Update joyent and wip
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2_multiarch

Conflicts:
	net/spread/Makefile
Update joyent and wip
Fix PKG_SYSCONFDIR location as per trunk (and upstream)
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2
Merge branch 'joyent/release/2013Q2' into joyent/release/2013Q2_multiarch
Merge branch 'joyent/release/2013Q2_multiarch' into joyent/release/2013Q2_sngl