Merge branch 'dbus-1.4' and update NEWS for master
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 18 Jul 2011 18:42:35 +0000 (19:42 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 18 Jul 2011 18:42:35 +0000 (19:42 +0100)
commitfeb31a33219bc0640c00138c14774995ab1a65a8
tree63c3724ebffdb5c23ddf7fdef0af409205a9059d
parent377051ee79f0ecf055c6e1d483a5f4f3158eec50
parent006dbd48fa31a8b5d024247bcba5d388bfda466a
Merge branch 'dbus-1.4' and update NEWS for master

Conflicts:
NEWS
NEWS
bus/Makefile.am
configure.ac
test/Makefile.am