From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 29 Apr 2011 04:12:42 +0000 (+0300)
Subject: #11952: merge with 3.1.
X-Git-Tag: v3.2.1b1~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17797a7310a0ad64d23be148c0ad9df99a410c92;p=thirdparty%2FPython%2Fcpython.git

#11952: merge with 3.1.
---

17797a7310a0ad64d23be148c0ad9df99a410c92