From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 27 Jul 2011 17:54:35 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.6~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2121ff07d5e180e5537418c8d0e69d59eafefdfc;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

2121ff07d5e180e5537418c8d0e69d59eafefdfc