From: Eli Bendersky <eliben@gmail.com>
Date: Sat, 30 Jul 2011 08:37:06 +0000 (+0300)
Subject: merge from 3.2 - heads
X-Git-Tag: v3.3.0a1~1801
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=052c83cf058c0511810d96253d0d4c391d11be0a;p=python

merge from 3.2 - heads
---

052c83cf058c0511810d96253d0d4c391d11be0a