From: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri, 21 May 2010 10:48:28 +0000 (+0100)
Subject: Merge branch 'dbus-1.2'
X-Git-Tag: dbus-1.3.1~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01ae2cb79376acb65b876c6620477fde86e6ef12;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.2'

Conflicts:
	bus/main.c
	configure.in
---

01ae2cb79376acb65b876c6620477fde86e6ef12