Merge tag 'upstream/2_rc2+svn387' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 27 Mar 2012 16:23:46 +0000 (19:23 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 27 Mar 2012 16:23:46 +0000 (19:23 +0300)
commit95272859bf1e18bf7b93c2cfea8ab4e1893a72e8
tree0d21ff8cba305cea6b9e8dac816c12fbf6ad78a7
parent4daa1909278a2615747e6a154d3a28a67661f13c
parentad1404891dc2249532dd060a63e16b2d6ef1e552
Merge tag 'upstream/2_rc2+svn387' into experimental

Upstream version 2~rc2+svn387

Conflicts:
lang/CMakeLists.txt
CMakeLists.txt