From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 20 Mar 2011 16:42:55 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~2836
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec60e31badeffe06ecddb77f0d02dc9a2d6e391b;p=python

Merge
---

ec60e31badeffe06ecddb77f0d02dc9a2d6e391b