From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 28 Jul 2011 10:32:46 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.6~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d7318ccc72b0b984a3a27e71eb5e9a3919ff3bb;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

0d7318ccc72b0b984a3a27e71eb5e9a3919ff3bb