From: Georg Brandl <georg@python.org>
Date: Mon, 24 Feb 2014 08:27:16 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.1rc1~233^2~220
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06a70621edfc4e2ef0bd72dc636ae9c4eacdfc0d;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

06a70621edfc4e2ef0bd72dc636ae9c4eacdfc0d