From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 30 Apr 2012 03:24:04 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.3.0a3~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e8ccb83046e78a76f5bc55412761d208644db7c;p=python

merge
---

0e8ccb83046e78a76f5bc55412761d208644db7c