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

merge with 3.3
---

55f4d56091c92f64bef61bed23d993441f5ed78e