Merge branch 'dbus-1.6'

author Simon McVittie <simon.mcvittie@collabora.co.uk>

Fri, 15 Jun 2012 15:03:49 +0000 (16:03 +0100)

committer Simon McVittie <simon.mcvittie@collabora.co.uk>

Fri, 15 Jun 2012 15:03:49 +0000 (16:03 +0100)
author Simon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 15 Jun 2012 15:03:49 +0000 (16:03 +0100)
committer Simon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 15 Jun 2012 15:03:49 +0000 (16:03 +0100)
diff --cc NEWS
Simple merge
diff --cc configure.ac
Simple merge
author	Simon McVittie <simon.mcvittie@collabora.co.uk>
	Fri, 15 Jun 2012 15:03:49 +0000 (16:03 +0100)
committer	Simon McVittie <simon.mcvittie@collabora.co.uk>
	Fri, 15 Jun 2012 15:03:49 +0000 (16:03 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history