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

merge with 3.3
---

3cb26b77b646b09f6f511a5dbd53770e9ffb9c93