From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 23 Oct 2011 21:50:21 +0000 (+0200)
Subject: Merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a705e72db2d1a0f232115fb65eea55af57b4883;p=python

Merge
---

5a705e72db2d1a0f232115fb65eea55af57b4883