From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 14 May 2011 03:23:20 +0000 (+0300)
Subject: Merge with 3.1.
X-Git-Tag: v3.3.0a1~2285^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3659f27ad37f992fadc1692137edf32c01c5bc66;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.1.
---

3659f27ad37f992fadc1692137edf32c01c5bc66