Merge branch 'dbus-1.4', omitting the DBUS_INLINE stuff
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 11 Aug 2011 10:26:58 +0000 (11:26 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 11 Aug 2011 10:26:58 +0000 (11:26 +0100)
commit513f1379125c208197846dce135d1f886ebc3361
treec2ef1b8abbadbb5e67179eb851d9b8ba1e25529b
parent0631b30ceae580bd3d782d9adab7b01914665fd7
parent70fb675a108dbf660d384150429c9af085b0c48e
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