From: Colin Walters <walters@verbum.org>
Date: Mon, 22 Mar 2010 18:39:56 +0000 (-0400)
Subject: Merge branch 'dbus-1.2'
X-Git-Tag: dbus-1.3.1~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df89cfeb3808acc213c9620db6988611a34207c5;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.2'

Conflicts:
	bus/dispatch.c
	configure.in
	test/name-test/test-names.c
---

df89cfeb3808acc213c9620db6988611a34207c5