Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 1 Jul 2011 13:54:42 +0000 (14:54 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 1 Jul 2011 13:54:42 +0000 (14:54 +0100)
1  2 
dbus/dbus-connection.c

Simple merge