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

Merge with 3.2
---

a179d283f713a0f1c81b93a9725efda06949f89e