From: Éric Araujo <merwok@netwok.org>
Date: Fri, 14 Oct 2011 14:56:17 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f598d60b452a75af08daa8c868c5e3240e71c15a;p=python

Merge 3.2
---

f598d60b452a75af08daa8c868c5e3240e71c15a