From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sun, 25 Dec 2011 13:34:59 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.10~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8ce35180653696187ee086e624e57505329eb97;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'

Conflicts:
	dbus/dbus-spawn-win.c
---

b8ce35180653696187ee086e624e57505329eb97