From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 13 Apr 2011 13:45:00 +0000 (+0300)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2597
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e610def7d552dfc7cb71f4cdf2aadb6deabda7c;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

5e610def7d552dfc7cb71f4cdf2aadb6deabda7c