From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 20 Mar 2011 22:25:25 +0000 (+0100)
Subject: merge
X-Git-Tag: v3.3.0a1~2830
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0421810b3b2dbf41c0ddb86d9d7711ca9dec2a2b;p=thirdparty%2FPython%2Fcpython.git

merge
---

0421810b3b2dbf41c0ddb86d9d7711ca9dec2a2b