From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 15 Dec 2012 18:26:38 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.4.0a1~1852
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c48e81ed46604db34783924307bc6bc01d9fa3c6;p=python

Merge
---

c48e81ed46604db34783924307bc6bc01d9fa3c6