From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 11 Aug 2011 10:26:58 +0000 (+0100)
Subject: Merge branch 'dbus-1.4', omitting the DBUS_INLINE stuff
X-Git-Tag: dbus-1.5.8~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=513f1379125c208197846dce135d1f886ebc3361;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4', omitting the DBUS_INLINE stuff

fd.o #40000 had effectively already been fixed (slightly differently)
on master.

Conflicts:
	cmake/config.h.cmake
---

513f1379125c208197846dce135d1f886ebc3361