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

Merge with 3.2
---

c9a5272e8dc0aaa5d0ce63297b72292f4982db18