From: Georg Brandl <georg@python.org>
Date: Mon, 17 Mar 2014 06:36:51 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.1rc1~232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7f48019d5550e071f364e18a17ff38b90e266bb;p=python

merge with 3.3
---

a7f48019d5550e071f364e18a17ff38b90e266bb