From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 19 Jan 2014 03:32:05 +0000 (-0500)
Subject: merge 3.3 (#18574)
X-Git-Tag: v3.4.0b3~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd22d39bae7f52f291ab9a374185ef4f8e5ff174;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#18574)
---

bd22d39bae7f52f291ab9a374185ef4f8e5ff174