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

merge with 3.3
---

e678f51e236a81acd7cdb7e1cefafaa9aa6115d2