Merge tag 'upstream/2_rc2+svn400' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 1 Apr 2012 03:02:18 +0000 (06:02 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 1 Apr 2012 03:02:18 +0000 (06:02 +0300)
Upstream version 2~rc2+svn400

Conflicts:
lang/CMakeLists.txt


Trivial merge