From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 15 Apr 2011 05:27:00 +0000 (+0300)
Subject: #11848: Merge with 3.1.
X-Git-Tag: v3.2.1b1~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82b0d5d144c1ed5dd095461c02bfd2299d5fa2ad;p=thirdparty%2FPython%2Fcpython.git

#11848: Merge with 3.1.
---

82b0d5d144c1ed5dd095461c02bfd2299d5fa2ad