From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 20 Mar 2011 23:28:52 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.2.1b1~245
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25871dac0091cf99e8e35271606b87898d9c4c45;p=python

Merge
---

25871dac0091cf99e8e35271606b87898d9c4c45