From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 11 Mar 2011 18:53:24 +0000 (+0200)
Subject: #11446: merge with 3.1.
X-Git-Tag: v3.2.1b1~325
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=147f6088f0279d79cb934816ca63e5fa216b34ce;p=python

#11446: merge with 3.1.
---

147f6088f0279d79cb934816ca63e5fa216b34ce