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

merge with 3.3
---

892cd0ef1fbcee49e4135300c3a869c0e03ba84c