From: Georg Brandl <georg@python.org>
Date: Sun, 12 Jan 2014 07:10:52 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0b3~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57bc1e21e7df2fe85ec87fcc11451939a309a4af;p=python

merge with 3.3
---

57bc1e21e7df2fe85ec87fcc11451939a309a4af