Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 28 Jul 2011 10:32:46 +0000 (11:32 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 28 Jul 2011 10:32:46 +0000 (11:32 +0100)
commit0d7318ccc72b0b984a3a27e71eb5e9a3919ff3bb
tree8fa155622189aac14dc06d0b34dd2521181bffb8
parent2121ff07d5e180e5537418c8d0e69d59eafefdfc
parent4335a092804ba376802ea6918cc56044e69a080b
Merge branch 'dbus-1.4'