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

Merge branch 'dbus-1.4'
---

eef30df87a732e756c844df7f99ffc6e86979f01