From: Georg Brandl <georg@python.org>
Date: Tue, 8 Oct 2013 19:54:47 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~206
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ebbb04af2c8d7bda2de941bf96205b154963316;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

3ebbb04af2c8d7bda2de941bf96205b154963316