From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 14 Jul 2011 12:57:12 +0000 (+0300)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~1911
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e73d49d3282bd4d87ddac6599778229f25c69a6b;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

e73d49d3282bd4d87ddac6599778229f25c69a6b