From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 12 May 2012 17:02:47 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a4~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04b2e69e67f0d7a6283150a0f634b94d9ba148bd;p=python

Merge
---

04b2e69e67f0d7a6283150a0f634b94d9ba148bd