Merge tag 'upstream/2.1.2' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 12 Feb 2013 17:55:58 +0000 (19:55 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 12 Feb 2013 17:55:58 +0000 (19:55 +0200)
Upstream version 2.1.2

Conflicts:
CMakeLists.txt


Trivial merge