From: Éric Araujo <merwok@netwok.org>
Date: Tue, 15 Nov 2011 15:13:16 +0000 (+0100)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~839
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f7f6150c38f1ed33d83c6597ae275ab5f5b99c5;p=python

Merge 3.2
---

5f7f6150c38f1ed33d83c6597ae275ab5f5b99c5