Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Thu, 3 Nov 2011 15:45:33 +0000 (16:45 +0100)
committerÉric Araujo <merwok@netwok.org>
Thu, 3 Nov 2011 15:45:33 +0000 (16:45 +0100)

Trivial merge