From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 3 May 2011 17:43:48 +0000 (+0300)
Subject: #11985: merge with 3.1.
X-Git-Tag: v3.2.1b1~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5098d44354d612445aa2dd97a304ed0c0660f236;p=thirdparty%2FPython%2Fcpython.git

#11985: merge with 3.1.
---

5098d44354d612445aa2dd97a304ed0c0660f236