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

merge with 3.3
---

5993e29d36f0cd22c06864d03dceee36fb473640