From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 21 Aug 2013 18:52:50 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.4.0a2~167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43f80e6c1f49c3590843d81a1b5ebbe1a2e1c62a;p=python

Merge heads
---

43f80e6c1f49c3590843d81a1b5ebbe1a2e1c62a