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

Merge branch 'dbus-1.4'
---

9a28fa6a4efec3e664d4d33a4dd471e021ab85dc