From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 24 Jun 2012 20:42:05 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b1~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f55100132288304b8e5d4798bbb7929a512e9b57;p=python

Merge
---

f55100132288304b8e5d4798bbb7929a512e9b57