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

merge with 3.3
---

af1edb7f457c34a2c659bdfda6a561eefad8b5ff