Merge 3.2

This commit is contained in:
Éric Araujo 2011-08-20 20:02:04 +02:00
commit 87f58d828a