From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 30 Jun 2012 15:33:13 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b2~355
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e38c98f97400fcaa5d7bf3f09ae5ab0c7e1e1dda;p=python

Merge
---

e38c98f97400fcaa5d7bf3f09ae5ab0c7e1e1dda