Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Aug 2011 13:18:27 +0000 (14:18 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Aug 2011 13:18:27 +0000 (14:18 +0100)
1  2 
cmake/CMakeLists.txt

Simple merge