From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 4 Feb 2013 00:26:51 +0000 (-0500)
Subject: merge 3.3 (#5289)
X-Git-Tag: v3.4.0a1~1453
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d41e01dfb56c28176665b7deef256d0cd5266708;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#5289)
---

d41e01dfb56c28176665b7deef256d0cd5266708