From: Georg Brandl <georg@python.org>
Date: Sun, 6 Oct 2013 17:24:00 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~222
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2a7e243aa98d439c8626d5ff242ac537d3083f3;p=python

merge with 3.3
---

a2a7e243aa98d439c8626d5ff242ac537d3083f3