From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 19 Feb 2014 17:03:58 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.3.5rc1^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bb6c358e886fabe1b04505e3d23cb3cf3fa89b5;p=python

Merge heads
---

2bb6c358e886fabe1b04505e3d23cb3cf3fa89b5