From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 5 Aug 2012 12:53:49 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b2~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=415d0f5cd3b2bb95c4a4da2f6a43a186335ae1a1;p=python

Merge
---

415d0f5cd3b2bb95c4a4da2f6a43a186335ae1a1