From: Éric Araujo <merwok@netwok.org>
Date: Mon, 5 Mar 2012 16:04:20 +0000 (+0100)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a2~276^2~16^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c53d6242359cd0dcf736a6c455a6397074815d46;p=python

Merge 3.2
---

c53d6242359cd0dcf736a6c455a6397074815d46