Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 17:21:09 +0000 (18:21 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 17:21:09 +0000 (18:21 +0100)
commit6bded84c40a79c8c5fb35377920ac7dfcfef7d5d
tree6fe2e1198fc3b104cec30433e3b76f32e729b298
parentcc5404cfa6487e095b1b401f3389a3c6174c10d3
parent337d9432f23636dc9fa7b7f1ab7d02857ccd269e
Merge branch 'dbus-1.4'

Conflicts:
NEWS
configure.ac