From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 29 May 2013 20:45:05 +0000 (+0300)
Subject: Merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad0e6b1034b2d727d666470f691364ebf8defd1b;p=python

Merge heads
---

ad0e6b1034b2d727d666470f691364ebf8defd1b