From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 12 Nov 2011 19:36:51 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~855
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4339a7767d6abdad62c8460805b5b44d6357ffaf;p=python

Merge
---

4339a7767d6abdad62c8460805b5b44d6357ffaf