From: Georg Brandl <georg@python.org>
Date: Fri, 11 Jan 2013 19:26:54 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~1641^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cba18fefdc1abee9232825d8a366227a1fcabe82;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

cba18fefdc1abee9232825d8a366227a1fcabe82