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

Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	configure.ac
---

6bded84c40a79c8c5fb35377920ac7dfcfef7d5d