Merge branch 'dbus-1.4'

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

Wed, 24 Aug 2011 10:26:13 +0000 (11:26 +0100)

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

Wed, 24 Aug 2011 10:26:13 +0000 (11:26 +0100)
author Simon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 24 Aug 2011 10:26:13 +0000 (11:26 +0100)
committer Simon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 24 Aug 2011 10:26:13 +0000 (11:26 +0100)
diff --cc NEWS
Simple merge
diff --cc dbus/dbus-sysdeps.h
Simple merge
author	Simon McVittie <simon.mcvittie@collabora.co.uk>
	Wed, 24 Aug 2011 10:26:13 +0000 (11:26 +0100)
committer	Simon McVittie <simon.mcvittie@collabora.co.uk>
	Wed, 24 Aug 2011 10:26:13 +0000 (11:26 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
dbus/dbus-sysdeps.h	patch \|	diff1 \|	diff2 \|	blob \| history