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

Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	configure.ac
---

6e03e0ee35ee4cce9a7415427ccd5bed163e7d45