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

Merge
---

ea9621102ef84c64f8e22fcb296eed64a1771ef1