Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 28 Jul 2011 15:24:11 +0000 (16:24 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 28 Jul 2011 15:24:11 +0000 (16:24 +0100)

Trivial merge