From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 8 Mar 2011 14:49:57 +0000 (+0200)
Subject: #11298: merge from 3.2.
X-Git-Tag: v3.3.0a1~2972
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=684d78cfb022955f1553e10029bf8e4ee2848c75;p=thirdparty%2FPython%2Fcpython.git

#11298: merge from 3.2.
---

684d78cfb022955f1553e10029bf8e4ee2848c75