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

merge with 3.3
---

fd115517100db5e868ef0c954f1191408687f21f