From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 22 Jun 2012 19:13:34 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b1~154^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f6213be2d5890d7bc3ba62db58ac1ce0215aaaa;p=python

Merge
---

5f6213be2d5890d7bc3ba62db58ac1ce0215aaaa