Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Aug 2012 19:02:11 +0000 (20:02 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Aug 2012 19:02:11 +0000 (20:02 +0100)
commit1dd0ff6d5bc95516d26bd1dff6dd97599ac60e2e
treef41cc515f26fc57929a942b86fe028b6cbfc4bc3
parente33c318c1399e58c8e1c0934282d2d47d9539b9b
parentb5d36dc27d1905d4d46ad7f0097f0ea0e0776adb
Merge branch 'dbus-1.6'
configure.ac