From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 12 Dec 2013 18:05:08 +0000 (+0100)
Subject: Merge from 3.3.
X-Git-Tag: v3.4.0b2~249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bf91dc41770d96812746da18a7e48ed03e67111;p=python

Merge from 3.3.
---

5bf91dc41770d96812746da18a7e48ed03e67111