From: Georg Brandl <georg@python.org>
Date: Fri, 2 Nov 2012 06:34:52 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~2110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faf1d06fb6636e6792330f9edaeb443a0b5cadf6;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

faf1d06fb6636e6792330f9edaeb443a0b5cadf6