From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 22 Nov 2011 21:23:23 +0000 (+0100)
Subject: Merge branch default
X-Git-Tag: v3.3.0a1~742^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbbd562f00053fb8e5113e9f66a5efc43790d314;p=python

Merge branch default
---

cbbd562f00053fb8e5113e9f66a5efc43790d314