From: Éric Araujo <merwok@netwok.org>
Date: Sun, 26 Feb 2012 03:07:37 +0000 (+0100)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=408026c7e8c019cf04372a4267c832241e18c62c;p=python

Merge 3.2
---

408026c7e8c019cf04372a4267c832241e18c62c