From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 8 Mar 2011 12:35:46 +0000 (+0000)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.4.8~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=257a6ef4963af05dfdd0ce45713994f562da07c9;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

257a6ef4963af05dfdd0ce45713994f562da07c9