From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 20 Mar 2011 16:36:26 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.2.1b1~247
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7903cb727ed841918c5b3bfeda28b0d6e54180b4;p=python

Merge
---

7903cb727ed841918c5b3bfeda28b0d6e54180b4