From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 25 Jan 2014 18:27:53 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0b3~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce8d153b0245d324735cdb72e4267f1dd9e52e1e;p=python

merge 3.3
---

ce8d153b0245d324735cdb72e4267f1dd9e52e1e