From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 16 Feb 2014 17:46:38 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.1rc1~233^2~314
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1bcfbd5107c4160a77bc9a02446694ea679e570c;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

1bcfbd5107c4160a77bc9a02446694ea679e570c