From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 17 May 2012 19:04:49 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a4~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62110c769f9681c7a747d3e136759937222edc7d;p=python

Merge
---

62110c769f9681c7a747d3e136759937222edc7d