From: Eli Bendersky <eliben@gmail.com>
Date: Fri, 11 Mar 2011 14:39:04 +0000 (+0200)
Subject: merge from 3.1
X-Git-Tag: v3.2.1b1~327
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7a1c1511121a26d6e669111bc515ab41667c77b;p=python

merge from 3.1
---

a7a1c1511121a26d6e669111bc515ab41667c77b