From: Éric Araujo <merwok@netwok.org>
Date: Mon, 20 Feb 2012 00:53:09 +0000 (+0100)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~131^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7e594b9a502f93d41dbdf3351e78d32c40f8001;p=python

Merge 3.2
---

a7e594b9a502f93d41dbdf3351e78d32c40f8001