From: Eli Bendersky <eliben@gmail.com>
Date: Fri, 2 Mar 2012 05:41:23 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92818d5383087d238f24b0a93d31a41bf6a75735;p=python

Merge 3.2
---

92818d5383087d238f24b0a93d31a41bf6a75735