From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 4 May 2011 15:39:29 +0000 (+0300)
Subject: #11985: merge with 3.1.
X-Git-Tag: v3.2.1b1~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e548f5a0018fb44ed3a2a365ff0c8c87e397eedd;p=thirdparty%2FPython%2Fcpython.git

#11985: merge with 3.1.
---

e548f5a0018fb44ed3a2a365ff0c8c87e397eedd