From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Fri, 6 May 2011 15:11:44 +0000 (+0200)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~2386
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45fd0c9931dbc25c2577e0b17672dffc36a03868;p=python

merge from 3.2
---

45fd0c9931dbc25c2577e0b17672dffc36a03868