From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 4 May 2012 21:17:03 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a4~275
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c04ddee8397d0d16d8c489251775101468ac3f8e;p=python

Merge
---

c04ddee8397d0d16d8c489251775101468ac3f8e