From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 26 Mar 2011 20:18:44 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~2743
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff5ee0cfef8b63c221d75af2009a31f6bdde664f;p=python

Merge
---

ff5ee0cfef8b63c221d75af2009a31f6bdde664f