From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 3 Jul 2012 19:12:16 +0000 (+0100)
Subject: Merge branch 'dbus-1.6'
X-Git-Tag: dbus-1.7.0~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55024f65a6d20ba268c96b5d42f8084c31e6a6f3;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.6'
---

55024f65a6d20ba268c96b5d42f8084c31e6a6f3