From: Colin Walters <walters@verbum.org>
Date: Tue, 2 Feb 2010 16:00:09 +0000 (-0500)
Subject: Merge branch 'my-dbus-1.2'
X-Git-Tag: dbus-1.3.1~120^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19d48c3344fa0b43d960c2f0b8b5fbb2f9f8cb86;p=thirdparty%2Fdbus.git

Merge branch 'my-dbus-1.2'

Conflicts:
	configure.in
---

19d48c3344fa0b43d960c2f0b8b5fbb2f9f8cb86