From: Eli Bendersky <eliben@gmail.com>
Date: Fri, 11 Mar 2011 14:42:13 +0000 (+0200)
Subject: dummy merge from 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=336c729563a3c0ec0d4955c59100ad772e9feb48;p=python

dummy merge from 3.2
---

336c729563a3c0ec0d4955c59100ad772e9feb48