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

Merge branch 'dbus-1.4'
---

2dd5f88cd45213733d0ae5bcda4c05a4590fb2a0