From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 16 Mar 2012 23:24:12 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a2~141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=020bf28200ca0025dd33e9c563df76e39388d832;p=python

Merge
---

020bf28200ca0025dd33e9c563df76e39388d832