From: Éric Araujo <merwok@netwok.org>
Date: Tue, 30 Aug 2011 14:21:47 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1600
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e1599ad48ab948af2f2907ace8b5bcd8ccfd3b2;p=python

Merge 3.2
---

9e1599ad48ab948af2f2907ace8b5bcd8ccfd3b2