Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 15 Aug 2011 08:56:03 +0000 (09:56 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 15 Aug 2011 08:56:03 +0000 (09:56 +0100)
commit0f72713e5a4a518282de7a36260c0490bc56be08
treec968510eb9c8aa348ce7e9b1166e3228e2651423
parent21947eb3710cc61938d8961c9f5bc878db5e2814
parent4a3e5b0af4046c602c98729a35786273f043bb09
Merge branch 'dbus-1.4'