From: Eli Bendersky <eliben@gmail.com>
Date: Tue, 29 May 2012 12:45:40 +0000 (+0300)
Subject: merge heads
X-Git-Tag: v3.3.0a4~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6066fe1258d7d8dcec7459267f159d5d73d920e2;p=python

merge heads
---

6066fe1258d7d8dcec7459267f159d5d73d920e2