From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 16 Apr 2011 16:55:16 +0000 (+0200)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0a1~2571
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4eb194ea6b2ec2b0bb4ce1ea1d65ade787bc728;p=python

Merge from 3.2
---

a4eb194ea6b2ec2b0bb4ce1ea1d65ade787bc728