From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 18 Dec 2011 18:00:16 +0000 (+0100)
Subject: Merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f694d72a284ac656772806f09ea9bf454550a98;p=python

Merge
---

0f694d72a284ac656772806f09ea9bf454550a98