From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 17 Jan 2013 11:52:42 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1589
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f1b6018a93ceada4cd9767e2b5f6a2ce8b701de;p=python

Merge 3.3.
---

9f1b6018a93ceada4cd9767e2b5f6a2ce8b701de