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

merge with 3.3
---

ce28e2c24b4c8bbead80f0ef0e948daff3ba4be6