Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 29 Jul 2011 15:28:32 +0000 (16:28 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 29 Jul 2011 15:28:32 +0000 (16:28 +0100)
commit6e03e0ee35ee4cce9a7415427ccd5bed163e7d45
treec9c9597c773de48850e532df42397f9123aa7818
parentfe5b9d3eac9e2ee9fb99288f34eb0eaf0a4c9c66
parent2dfee7317cad8b189dea42e44f1082fb6d91bfe3
Merge branch 'dbus-1.4'

Conflicts:
NEWS
configure.ac