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

merge with 3.3
---

793d8478eeb1ca73b95aa6dac97361013d9e8b60