From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 13 Jul 2012 18:59:35 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b2~224
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c287423cb02ab4f466191cfea1d038f857b7db5c;p=python

Merge
---

c287423cb02ab4f466191cfea1d038f857b7db5c