From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 22 Jun 2012 20:07:24 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b1~154^2~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1326e8f301bea3032e4f0b7659953da7bef3846b;p=python

Merge
---

1326e8f301bea3032e4f0b7659953da7bef3846b