From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 15 Feb 2012 21:30:29 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~171
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91a874196096c9842144804861a4b1593d730315;p=python

Merge
---

91a874196096c9842144804861a4b1593d730315