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

Trivial merge