From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 14 Jan 2014 04:14:58 +0000 (-0500)
Subject: merge 3.3 (#20246)
X-Git-Tag: v3.4.0b3~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3993d78fbd5fbb516e36750f83c47017ba29b21f;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#20246)
---

3993d78fbd5fbb516e36750f83c47017ba29b21f