From: Ezio Melotti <none@none>
Date: Fri, 15 Apr 2011 15:07:38 +0000 (+0300)
Subject: #11843: Merge with 3.1.
X-Git-Tag: v3.2.1b1~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8881868e08439cf758c0bcdcf7cdb54c822ae1f2;p=thirdparty%2FPython%2Fcpython.git

#11843: Merge with 3.1.
---

8881868e08439cf758c0bcdcf7cdb54c822ae1f2