From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 20 Jan 2013 15:05:28 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1568
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7ce184fe84fa2edba79dd7f0b78e29f10b64c37;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

e7ce184fe84fa2edba79dd7f0b78e29f10b64c37