Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 7 Mar 2011 14:51:46 +0000 (14:51 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 7 Mar 2011 14:51:46 +0000 (14:51 +0000)

Trivial merge