merge with 3.2
authorSandro Tosi <sandro.tosi@gmail.com>
Sat, 24 Dec 2011 22:13:39 +0000 (23:13 +0100)
committerSandro Tosi <sandro.tosi@gmail.com>
Sat, 24 Dec 2011 22:13:39 +0000 (23:13 +0100)

Trivial merge