Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 7 Apr 2011 16:15:41 +0000 (17:15 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 7 Apr 2011 16:15:41 +0000 (17:15 +0100)

Trivial merge