From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 2 Feb 2013 22:09:49 +0000 (+0100)
Subject: Null merge
X-Git-Tag: v3.3.1rc1~242
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12b04cfccad8c79747409424a609445be1b8bf44;p=python

Null merge
---

12b04cfccad8c79747409424a609445be1b8bf44