From: Éric Araujo <merwok@netwok.org>
Date: Wed, 20 Apr 2011 18:22:57 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2488^2~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab20b164b95fc9daaf5dbbb08bce6da2135d34ed;p=python

Merge 3.2
---

ab20b164b95fc9daaf5dbbb08bce6da2135d34ed