From: Stefan Krah <skrah@bytereef.org>
Date: Tue, 19 Feb 2013 13:02:59 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1356
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e06d1d0b9964513068a993074340b07e17fa04e;p=python

Merge 3.3.
---

5e06d1d0b9964513068a993074340b07e17fa04e