From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 14 Mar 2011 11:58:36 +0000 (+0000)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.0~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c8c7d9c1e4ecebccb26e39b1b7f780a93bd952b;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

8c8c7d9c1e4ecebccb26e39b1b7f780a93bd952b