From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 13 May 2013 00:02:05 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~736
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa6bdc6d8651e8240f2964ea628a188fb2d594c6;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

fa6bdc6d8651e8240f2964ea628a188fb2d594c6