From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 15 Dec 2013 19:52:08 +0000 (+0100)
Subject: Merge from 3.3.
X-Git-Tag: v3.4.0b2~212
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae01a8bcdfb4117843e9e0f97ecac9aa9ffd7230;p=python

Merge from 3.3.
---

ae01a8bcdfb4117843e9e0f97ecac9aa9ffd7230