From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 21 Mar 2011 01:12:09 +0000 (+0100)
Subject: merge
X-Git-Tag: v3.3.0a1~2824
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee525de6a947c05e8deb44c0675a2bb3e5130497;p=python

merge
---

ee525de6a947c05e8deb44c0675a2bb3e5130497