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

Trivial merge