From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 15 Aug 2011 08:56:03 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.8~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f72713e5a4a518282de7a36260c0490bc56be08;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

0f72713e5a4a518282de7a36260c0490bc56be08