From: Stefan Krah <skrah@bytereef.org>
Date: Sat, 22 Dec 2012 13:57:16 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1801
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5383d2d2e4929bab30bd688b02cf0cb3e0fb5cd9;p=python

Merge 3.3.
---

5383d2d2e4929bab30bd688b02cf0cb3e0fb5cd9