From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 23 Aug 2011 17:49:43 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a1~1629
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed38bfb714172930a1cea657c247f07d03435030;p=python

Merge
---

ed38bfb714172930a1cea657c247f07d03435030