From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 22 Mar 2011 17:34:21 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~2798
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7969d3334f0db9ccb9b97db77ad582d6103c12c7;p=python

Merge
---

7969d3334f0db9ccb9b97db77ad582d6103c12c7