Merge tag 'upstream/2_rc2+svn363' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 15 Mar 2012 13:22:44 +0000 (15:22 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 15 Mar 2012 13:22:44 +0000 (15:22 +0200)
commit3c8faa9427da074c432aaef1d6a744da5cae7edb
tree535b02d69836ee63fe0c6a591ac44c720bf9168c
parentd3aa2fbeb746cb896468a12343f9c706cf09f47c
parentc431af774ccd1abe17275316b7df8f72a854d75c
Merge tag 'upstream/2_rc2+svn363' into experimental

Upstream version 2~rc2+svn363
CMakeLists.txt