From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Tue, 2 Aug 2011 16:43:49 +0000 (+0200)
Subject: #12665: merge with 3.2
X-Git-Tag: v3.3.0a1~1774^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4f9e2ff2198357605e38e4e1cfade5fbe097213;p=python

#12665: merge with 3.2
---

e4f9e2ff2198357605e38e4e1cfade5fbe097213