Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 25 May 2011 16:39:34 +0000 (17:39 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 25 May 2011 16:39:34 +0000 (17:39 +0100)
commitfd99c3a1c16ff645e9d080574bdb999de7ee65f2
tree90d5913ef9f67b188dc3b662dcfd64755a40a72d
parenteef30df87a732e756c844df7f99ffc6e86979f01
parentcea055514a9dfc74e7f0515cf4a256da10a891bc
Merge branch 'dbus-1.4'
configure.ac