From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sat, 17 Dec 2011 21:40:19 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~583
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb305de584414f082afc1cbc2cd61160ef46d88a;p=thirdparty%2FPython%2Fcpython.git

Merge
---

bb305de584414f082afc1cbc2cd61160ef46d88a