From: Georg Brandl <georg@python.org>
Date: Tue, 21 Jan 2014 18:20:58 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0b3~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2866c6a2a1ebedd1e57d2973b0a77ed14684427d;p=python

merge with 3.3
---

2866c6a2a1ebedd1e57d2973b0a77ed14684427d