From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 18 Apr 2012 14:59:52 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.3.0a3~169
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eca851815d654c6e6ef50fe0b38b9e9c6076ceea;p=python

Merge heads
---

eca851815d654c6e6ef50fe0b38b9e9c6076ceea