From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 8 Jul 2012 10:43:59 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b2~281
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2faa5b3810aa8112c8194bd5cf5e60ec43ff76c;p=python

Merge
---

c2faa5b3810aa8112c8194bd5cf5e60ec43ff76c