Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Sep 2014 12:41:12 +0000 (13:41 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Sep 2014 12:41:12 +0000 (13:41 +0100)

Trivial merge