From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 12 May 2012 21:44:59 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a4~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb54b33cec2d83e8b5f6100361ff57cb22b5105a;p=python

Merge
---

bb54b33cec2d83e8b5f6100361ff57cb22b5105a