Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 26 Apr 2011 18:20:18 +0000 (19:20 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 26 Apr 2011 18:20:18 +0000 (19:20 +0100)
commit338678757cad266f52368d6bb5eb11b9f847b9db
treecff9cbfdd1caff6d3199bca0f75bb89738015911
parentfa3759d9d0d4b0691bdc80efdb0ff03430b788cb
parent614ea05b182b3cd142c6ad9da43e65a7113a0ea4
Merge branch 'dbus-1.4'

Conflicts:
NEWS
NEWS