From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Sun, 4 Aug 2013 19:19:49 +0000 (-0400)
Subject: Merge.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44473f26deaa7c524a674f5e3a68a34d30488166;p=python

Merge.
---

44473f26deaa7c524a674f5e3a68a34d30488166