Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 14 Jul 2011 15:49:02 +0000 (16:49 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 14 Jul 2011 15:49:02 +0000 (16:49 +0100)
commite9197996fec987f672f46cccfd1cfad0d088aa57
tree9277551a641a563e4d2fa94f95a2b1952b3e5bdd
parentb86e967d63ea06394e2c99c77ed30e864e9e3d0d
parentc6c18741796ba99978878106ba915b3e0be225e4
Merge branch 'dbus-1.4'