From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 18 Jan 2014 05:46:49 +0000 (-0500)
Subject: merge 3.3 (#17814)
X-Git-Tag: v3.4.0b3~112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8af6700b92d922dd115647fd5c8022a730848d3;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#17814)
---

d8af6700b92d922dd115647fd5c8022a730848d3