From: Eli Bendersky <eliben@gmail.com>
Date: Wed, 15 Aug 2012 11:50:52 +0000 (+0300)
Subject: merge heads in 3.2 branch
X-Git-Tag: v3.3.0rc1~108^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f748a3773fd40dd91195fc2fef2cac2f973baaf8;p=python

merge heads in 3.2 branch
---

f748a3773fd40dd91195fc2fef2cac2f973baaf8