Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 24 Feb 2011 17:17:36 +0000 (17:17 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 24 Feb 2011 17:17:36 +0000 (17:17 +0000)
commitd9e1959dcfd643bb7b096eba07e326c1093a2ba3
treece0cfa6fdf6cfd96cb38fb872bc450a984e3567f
parent7f8059e00d61f539ad47844bb80d3c639f6f42c4
parent3681753421e4f5538e938f7d151c901f7c2f34d1
Merge branch 'dbus-1.4'