Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 4 Feb 2015 17:06:54 +0000 (17:06 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 4 Feb 2015 17:07:25 +0000 (17:07 +0000)

Trivial merge