From: Stefan Krah <skrah@bytereef.org>
Date: Sat, 26 Jan 2013 12:07:36 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1521^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4a10f59703e91e5085f927e98a84d82831e3d9c;p=python

Merge 3.3.
---

c4a10f59703e91e5085f927e98a84d82831e3d9c