From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 13 Feb 2012 17:36:51 +0000 (+0000)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.10~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e70eea571509aef68289de729d4acc2b235130fd;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	configure.ac
---

e70eea571509aef68289de729d4acc2b235130fd