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

Merge 3.3.
---

2d7ee47e423cb9ed44b49e16fcaf3a10adfd62ef