From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 9 Jul 2011 14:02:58 +0000 (+0200)
Subject: Dummy merge
X-Git-Tag: v3.3.0a1~1927
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=966a399a597ccfe8988f1cc91aa15c30192250be;p=python

Dummy merge
---

966a399a597ccfe8988f1cc91aa15c30192250be