From: Georg Brandl <georg@python.org>
Date: Wed, 15 May 2013 17:43:15 +0000 (+0200)
Subject: null-merge from 3.3
X-Git-Tag: v3.4.0a1~724
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe361dfab588b75b9714b31648b98b982e6d1eda;p=python

null-merge from 3.3
---

fe361dfab588b75b9714b31648b98b982e6d1eda