Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 15 Jun 2012 12:23:13 +0000 (13:23 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 15 Jun 2012 12:23:13 +0000 (13:23 +0100)
commit085cabfbf4262087aaaa2cf3a567c9aaa0aec282
treedc748fafb54b629ab250a6f0151c70b4b0dac017
parentf141c260ce4d438299804e89bb77c3bef81ed86b
parent09d71f92c349fb25053136fd329b5903c7216bdd
Merge branch 'dbus-1.6'

Conflicts:
NEWS
configure.ac
NEWS