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

merge with 3.3
---

f3c91210b9c99a2c0e37cc1fe74efeb79de94350