From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 1 Oct 2012 21:44:00 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.1rc1~815^2~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77cddc316477b002453f4b9e95278b93b3cb3070;p=python

Merge
---

77cddc316477b002453f4b9e95278b93b3cb3070