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

Merge branch 'dbus-1.6'
---

aef027e94691c3031a7dbe4c2387aed2e7f8a82d