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

merge with 3.3
---

bc332a2415884f6c199f9b016c9dd53459c06cef