From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Fri, 22 Jun 2012 16:48:08 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0b1~154^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67064bc1b6b4fb71e1698dc898b9f7d8065a4a70;p=python

merge
---

67064bc1b6b4fb71e1698dc898b9f7d8065a4a70