From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 13 Aug 2012 19:13:27 +0000 (+0100)
Subject: Merge branch 'dbus-1.6', rejecting reversion of #38201
X-Git-Tag: dbus-1.7.0~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d353e73d35f4de18dc075579208fa4928553ad1b;p=thirdparty%2Fdbus.git

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

d353e73d35f4de18dc075579208fa4928553ad1b