From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 24 Aug 2011 10:26:13 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.8~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eddc3265c31f31349bc06af396393dbd6cbe8eb;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

2eddc3265c31f31349bc06af396393dbd6cbe8eb