Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 25 May 2011 16:00:18 +0000 (17:00 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 25 May 2011 16:00:18 +0000 (17:00 +0100)
1  2 
NEWS
configure.ac

diff --cc NEWS
Simple merge
diff --cc configure.ac
Simple merge