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

merge 3.3
---

668d2cc3d8a6f4336b20208e27de58554f04ec68