From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 1 Oct 2012 21:44:19 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.4.0a1~2416
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bfcf51b5d0ca5a0bbd7045c318f5aa31e5f7de8;p=python

Merge
---

8bfcf51b5d0ca5a0bbd7045c318f5aa31e5f7de8