Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 8 Mar 2011 12:35:46 +0000 (12:35 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 8 Mar 2011 12:35:46 +0000 (12:35 +0000)
1  2 
NEWS

diff --cc NEWS
Simple merge