Merge tag 'upstream/2_rc2+svn367' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 16 Mar 2012 15:23:05 +0000 (17:23 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 16 Mar 2012 15:23:05 +0000 (17:23 +0200)
commit2ac3db4633214f8a2a78cdc38eacf124cf5323ec
tree4a86526d33e43b2812090c0fc45abf0f204f34a2
parent7e1c03e94741bb341960b3877b006573f84ab8a6
parent09716c8c88067f867e7b3821c4a0f8429df39e7d
Merge tag 'upstream/2_rc2+svn367' into experimental

Upstream version 2~rc2+svn367
CMakeLists.txt