From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 26 Mar 2011 20:16:07 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.2.1b1~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8ad68f34c23645c1a1dfadd63470b3851ba5bea;p=python

Merge
---

d8ad68f34c23645c1a1dfadd63470b3851ba5bea