From: Łukasz Langa <lukasz@langa.pl>
Date: Mon, 12 Mar 2012 18:59:48 +0000 (+0100)
Subject: Head merge.
X-Git-Tag: v3.3.0a2~234^2~10^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17591c1a1d0a6ba20f3b68e2c438d9b9baabc6c9;p=python

Head merge.
---

17591c1a1d0a6ba20f3b68e2c438d9b9baabc6c9