Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 15 Aug 2011 08:56:03 +0000 (09:56 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 15 Aug 2011 08:56:03 +0000 (09:56 +0100)

Trivial merge