From: Eli Bendersky <eliben@gmail.com>
Date: Wed, 15 Aug 2012 11:51:08 +0000 (+0300)
Subject: merge 3.2
X-Git-Tag: v3.3.0rc1~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdbc0b08d07c73133ac46dc8e51057459c11d97f;p=python

merge 3.2
---

bdbc0b08d07c73133ac46dc8e51057459c11d97f