From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 21 Mar 2011 02:28:10 +0000 (+0100)
Subject: merge 3.1 (already commited before)
X-Git-Tag: v3.2.1b1~240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec1c030aad76568c358363a8fb6444edf82bdcad;p=python

merge 3.1 (already commited before)
---

ec1c030aad76568c358363a8fb6444edf82bdcad