From: Georg Brandl <georg@python.org>
Date: Mon, 14 Oct 2013 14:08:25 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=979541935ab96dbd6c08f367bc2e9d11428954ba;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

979541935ab96dbd6c08f367bc2e9d11428954ba