Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 3 May 2011 09:27:52 +0000 (10:27 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 3 May 2011 09:27:52 +0000 (10:27 +0100)
1  2 
dbus/dbus-connection.c

Simple merge