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

merge with 3.3
---

3e30d471e912bf20cc07e9ddf2e1c79de47bf2ae