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

Merge branch 'dbus-1.6'
---

1dd0ff6d5bc95516d26bd1dff6dd97599ac60e2e