Merge branch 'dbus-1.6', rejecting reversion of #38201
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Aug 2012 19:13:27 +0000 (20:13 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Aug 2012 19:14:16 +0000 (20:14 +0100)

Trivial merge