Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 6 Mar 2014 13:11:09 +0000 (13:11 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 6 Mar 2014 13:11:09 +0000 (13:11 +0000)

Trivial merge