From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 31 Oct 2012 18:22:31 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~2124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8781d4a84c778bcb1b11e11877949f06ea4fcf3e;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

8781d4a84c778bcb1b11e11877949f06ea4fcf3e