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

merge with 3.3
---

834a73bf4ff4eb79c0e9cd9d1346751a2deb5db6