From: Éric Araujo <merwok@netwok.org>
Date: Wed, 15 Feb 2012 17:13:00 +0000 (+0100)
Subject: Merge fix from 3.2
X-Git-Tag: v3.3.0a1~176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a76eff7db06b5f56e973cd654fb819abf439c8b2;p=python

Merge fix from 3.2
---

a76eff7db06b5f56e973cd654fb819abf439c8b2