From: Stefan Krah <skrah@bytereef.org>
Date: Sat, 4 Jan 2014 12:06:59 +0000 (+0100)
Subject: Merge from 3.3.
X-Git-Tag: v3.4.0b2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41adc2670882d49b3120ed2f6803c5a289650648;p=python

Merge from 3.3.
---

41adc2670882d49b3120ed2f6803c5a289650648