From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 27 Feb 2012 00:01:58 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a346dbcb7307650f16e35a1a59a15c6e937e908;p=python

Merge
---

6a346dbcb7307650f16e35a1a59a15c6e937e908