Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 12 Apr 2011 10:27:09 +0000 (11:27 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 12 Apr 2011 10:27:09 +0000 (11:27 +0100)
commit9a28fa6a4efec3e664d4d33a4dd471e021ab85dc
treee9b74e025124f3589db9a7ec62b2c6842789a530
parent9ddd3ae25c0eed86f2e3ed0c1543ec36bf3eff5c
parent59c6663293bbbd9399f4c16611e06bbe799ddb8a
Merge branch 'dbus-1.4'