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

merge with 3.3
---

59e3b231614ad7cd78a85844cf5116eb1232cf05