From: Eli Bendersky <eliben@gmail.com>
Date: Thu, 10 Jan 2013 14:36:07 +0000 (-0800)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~1658
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15d24b7c4c993fc0320e9ce906b41bdaec5d8bc2;p=python

Merge 3.3
---

15d24b7c4c993fc0320e9ce906b41bdaec5d8bc2