From: Georg Brandl <georg@python.org>
Date: Sun, 3 Feb 2013 13:00:38 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~1459
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd50108341ca4a8e78bf57f2b64b02f7526e8166;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

cd50108341ca4a8e78bf57f2b64b02f7526e8166