Merge tag 'upstream/2.0' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Wed, 18 Apr 2012 16:07:37 +0000 (19:07 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Wed, 18 Apr 2012 16:07:37 +0000 (19:07 +0300)
Upstream version 2.0

Conflicts:
CMakeLists.txt
lang/CMakeLists.txt


Trivial merge