From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 28 Jul 2011 15:24:11 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.6~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72ee30d43b1316269545b00ca8ebd3ef129c0d40;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

72ee30d43b1316269545b00ca8ebd3ef129c0d40