From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 7 May 2011 17:48:40 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a1~2363
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c736bb38ec6089f5360e6a7f2f76a70fb869352;p=python

Merge
---

2c736bb38ec6089f5360e6a7f2f76a70fb869352