Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 8 Jun 2011 10:38:21 +0000 (11:38 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 8 Jun 2011 10:38:21 +0000 (11:38 +0100)
1  2 
NEWS

diff --cc NEWS
Simple merge