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

merge with 3.3
---

42840f017d7345c83e907208a3d7d476557ea4ed