From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 15 Mar 2011 21:05:51 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.2.1b1~288
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f228e5bca5bb0f764528e16c2e811b0edeb30b8a;p=python

Merge
---

f228e5bca5bb0f764528e16c2e811b0edeb30b8a