From: Colin Walters <walters@verbum.org>
Date: Wed, 15 Jul 2009 21:39:17 +0000 (-0400)
Subject: Merge branch 'dbus-1.2'
X-Git-Tag: dbus-1.3.0~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56f7ce147e82c7eb529ccba634013e97d53b23c0;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.2'

Conflicts:
	configure.in
---

56f7ce147e82c7eb529ccba634013e97d53b23c0