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

merge with 3.3
---

93c85a9d1b3e6862e8133f13baf512106ba254cf