From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 17 Feb 2013 00:05:46 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.4.0a1~1367
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcbe46bc5bad217e934568cfe59e3e807501acc3;p=python

Merge
---

dcbe46bc5bad217e934568cfe59e3e807501acc3