From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 21 Feb 2012 19:52:54 +0000 (+0100)
Subject: Null merge
X-Git-Tag: v2.7.3rc1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d6eab9088a88e37f4a612e563cdab103b9676cb;p=python

Null merge
---

5d6eab9088a88e37f4a612e563cdab103b9676cb