From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 13 Mar 2011 00:29:11 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2941^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32657fb15222e9e447a848cdaca98edd74ec0c4c;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

32657fb15222e9e447a848cdaca98edd74ec0c4c