Integrate some more diffs from the 1.5 branch
authorMathieu Malaterre <mathieu.malaterre@gmail.com>
Mon, 13 Feb 2012 09:42:26 +0000 (09:42 +0000)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>
Mon, 13 Feb 2012 09:42:26 +0000 (09:42 +0000)
commitee957a428509da8f8896395262cae9a153b9316f
tree9e33a3998ef52eef047b7641e1fde7d9f46d102c
parentc63331a303a15aeb1c38b0bab546ff47a41b8335
Integrate some more diffs from the 1.5 branch
doc/CMakeLists.txt