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

merge with 3.3
---

4f198de5b2624dd04568c9f7eeecfed3c45f9f14