Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 8 Feb 2012 19:06:51 +0000 (19:06 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 8 Feb 2012 19:06:51 +0000 (19:06 +0000)
commit2a8be5a2f5d9c848e10c8c505f02eebd48276c3a
treecf472e6a25045858312a88ec8db2ccc5c11dfc7d
parent5a548fbf641bbd93d28009281c97e3e1aab1adad
parenta9e14209a25051a119a207a014750af83251b6b1
Merge branch 'dbus-1.4'

Conflicts:
NEWS
NEWS