From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Fri, 13 Apr 2012 00:23:59 +0000 (+0200)
Subject: hg merge 3.2
X-Git-Tag: v3.3.0a3~243^2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8963943fc39fc0f44c30fd97d4f8faab1393686e;p=python

hg merge 3.2
---

8963943fc39fc0f44c30fd97d4f8faab1393686e