From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Wed, 13 Apr 2011 03:08:14 +0000 (-0400)
Subject: Merge
X-Git-Tag: v3.3.0a1~2600
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5eacc2928caa6b2284d3087a2f36ff0a4c7141c;p=python

Merge
---

b5eacc2928caa6b2284d3087a2f36ff0a4c7141c