From: Kristján Valur Jónsson <sweskman@gmail.com>
Date: Tue, 19 Mar 2013 23:35:26 +0000 (-0700)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~1149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca038562be7affd9668365ecf12051b411679577;p=python

Merge with 3.3
---

ca038562be7affd9668365ecf12051b411679577