From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 9 Jan 2014 15:36:23 +0000 (-0600)
Subject: merge 3.3
X-Git-Tag: v3.4.0b3~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=766e10c4a808727ecefca7dec59819121477d27f;p=python

merge 3.3
---

766e10c4a808727ecefca7dec59819121477d27f