From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 28 Apr 2011 22:49:33 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a1~2468
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09db87b63366b4a02b53b4e5bf51149f8153ff35;p=python

Merge
---

09db87b63366b4a02b53b4e5bf51149f8153ff35