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

merge with 3.3
---

b68b970a01338ca3f4ca609486cb3e1512051f9e