Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 27 Jul 2011 17:54:35 +0000 (18:54 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 27 Jul 2011 17:54:35 +0000 (18:54 +0100)
commit2121ff07d5e180e5537418c8d0e69d59eafefdfc
treeb1cff6145fab6c6fc364a64ce88f08ae3fafc5d4
parent6ca26b7700b73087e00861440705577f7689b7a1
parent2c776890bf179e2abb044f98d379baf5417c07a8
Merge branch 'dbus-1.4'