From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 25 May 2011 16:39:34 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd99c3a1c16ff645e9d080574bdb999de7ee65f2;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

fd99c3a1c16ff645e9d080574bdb999de7ee65f2