Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 3 Jul 2012 19:12:16 +0000 (20:12 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 3 Jul 2012 19:12:16 +0000 (20:12 +0100)
1  2 
NEWS

diff --cc NEWS
Simple merge