From: Stefan Krah <skrah@bytereef.org>
Date: Wed, 16 Jan 2013 12:00:11 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1596
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d554b04286604c0ff935067314ff2da6588105a;p=python

Merge 3.3.
---

6d554b04286604c0ff935067314ff2da6588105a