Merge branch 'dbus-1.6', rejecting reversion of #38201

This commit is contained in:
Simon McVittie 2012-08-13 20:13:27 +01:00
commit d353e73d35

Diff content is not available