From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 20 Jan 2014 14:35:38 +0000 (+0100)
Subject: Merge from 3.3.
X-Git-Tag: v3.4.0b3~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34e4628453a01330a41c0d0baddc1408a38e5de4;p=python

Merge from 3.3.
---

34e4628453a01330a41c0d0baddc1408a38e5de4