From: Kristjan Valur Jonsson <sweskman@gmail.com>
Date: Wed, 30 Mar 2011 11:32:06 +0000 (+0000)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2728
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=978da33c7a07bf133d144a7ad342de7e20777250;p=python

Merge 3.2
---

978da33c7a07bf133d144a7ad342de7e20777250