Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 10 Mar 2011 19:07:15 +0000 (19:07 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 10 Mar 2011 19:07:15 +0000 (19:07 +0000)

Trivial merge