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

Merge branch 'dbus-1.4'
---

e9197996fec987f672f46cccfd1cfad0d088aa57