From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 23 Jul 2013 05:08:17 +0000 (-0700)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26421ab30258fd3e30c67cc718bcbd38c8789682;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

26421ab30258fd3e30c67cc718bcbd38c8789682