From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 24 Jun 2012 15:23:12 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b40a0b10250830438c53e8a43f7f9fac2b9b889;p=python

Merge
---

0b40a0b10250830438c53e8a43f7f9fac2b9b889