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

merge with 3.3
---

6d7d6cf76ec090ef776e70e6591215c8213e012e