From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 29 Jan 2013 08:40:16 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.3.1rc1~275
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c32c23f658bff716c2d677bc13d60c4bc7fba4b;p=python

Merge heads
---

4c32c23f658bff716c2d677bc13d60c4bc7fba4b