Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 1 Jun 2011 11:19:02 +0000 (12:19 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 1 Jun 2011 11:19:02 +0000 (12:19 +0100)
commita31ac98f18eaaadf2098e911388b11aa24d46fa7
tree81a491221adbd0db84dbe6f263474e1b78910a74
parentb1e28fba0bcbd62d3cfbd6ce861de036d9d0537a
parentb0503e03fd0c0959865f4d9a39cce26e7d079fb0
Merge branch 'dbus-1.4'

Conflicts:
NEWS
configure.ac
NEWS
configure.ac