From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 18 Dec 2011 18:31:02 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.2.3rc1~270
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92ed3877b471e5e285b5e76b6f13547e579daaa4;p=python

Merge
---

92ed3877b471e5e285b5e76b6f13547e579daaa4