From: Thiago Macieira <thiago@kde.org>
Date: Wed, 13 May 2009 13:52:18 +0000 (+0200)
Subject: Merge branch 'dbus-1.2'
X-Git-Tag: dbus-1.3.0~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e21d06cba4cb5c5e3e201a54336e9df3c24a1c21;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.2'

Conflicts:
	dbus/dbus-sysdeps-util-unix.c
---

e21d06cba4cb5c5e3e201a54336e9df3c24a1c21