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

merge with 3.3
---

03d010be147ca85a18bf26a54991ddc94264e12b