Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 24 Feb 2011 17:17:36 +0000 (17:17 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 24 Feb 2011 17:17:36 +0000 (17:17 +0000)

Trivial merge