Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 11 Aug 2011 10:54:52 +0000 (11:54 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 11 Aug 2011 10:54:52 +0000 (11:54 +0100)
commit0611a71c67b39d90565144de20c946447e2bbea6
treec48b33e5d30d274ecf09d80a0252bb4b14640fa0
parent513f1379125c208197846dce135d1f886ebc3361
parent0b9e2b8b490161236c4b16afbd17fdb7243dcb9b
Merge branch 'dbus-1.4'

Conflicts:
NEWS
NEWS
dbus/dbus-marshal-basic.c
dbus/dbus-string-private.h