From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 7 Apr 2011 16:15:41 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c99ead074a5c0917716c28c2ff1dc2e0c74a1b53;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

c99ead074a5c0917716c28c2ff1dc2e0c74a1b53