From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 18 Jul 2011 14:15:45 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.6~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c774ca21016ec0bfaf2ec93c5e9c51f56358edc4;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

c774ca21016ec0bfaf2ec93c5e9c51f56358edc4