From: Éric Araujo <merwok@netwok.org>
Date: Wed, 7 Mar 2012 19:50:06 +0000 (+0100)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a2~270
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00b41fc8283823eda6347c282d922a5edc15c37d;p=python

Merge 3.2
---

00b41fc8283823eda6347c282d922a5edc15c37d