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

Merge
---

00081f38696a21de7de15378c8748e8d0b2d8702