From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 21 Mar 2011 01:15:18 +0000 (+0100)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2823
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=161fbeae72872c3a65408da6560501bcc99cdbdb;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

161fbeae72872c3a65408da6560501bcc99cdbdb