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

merge with 3.3
---

8ae2ab5d532c331d50e3e2ae1ffd67bab1478bb6