From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 10 Jun 2011 21:46:42 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=166bed249d59a349ad50ea1842b3147475036269;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	configure.ac
---

166bed249d59a349ad50ea1842b3147475036269