From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 27 Feb 2012 00:01:44 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~52^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f12b4475cc44c612e5d461cad7d7b511bf34d6dc;p=python

Merge
---

f12b4475cc44c612e5d461cad7d7b511bf34d6dc