From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 4 Mar 2012 19:59:01 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a2~276^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7dabd849fdac650317004092894e61e1d7e5046;p=python

Merge
---

f7dabd849fdac650317004092894e61e1d7e5046