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

Merge
---

f134dceeae096db3e6f343954aca1cf0e0cc7922