Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 26 Apr 2011 18:05:53 +0000 (19:05 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 26 Apr 2011 18:05:53 +0000 (19:05 +0100)
commit1aab9940777ef4ecd361a3e21d190cbaa3e64e86
treece82d2ebad93f811074cebc540eb6b9af951ad1a
parentb52ad4a8e118d4ff18bb8e32888ec63e2ab4c5fe
parent8423a42999ff625a61e43f8acc55a4522ebc8c26
Merge branch 'dbus-1.4'

Conflicts:
NEWS
NEWS
configure.ac