From: Georg Brandl <georg@python.org>
Date: Sun, 24 Nov 2013 15:18:23 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0b2~507^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d01c4b6bbb7b35edd8cd4f4577e2c97cba8b9fa;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

4d01c4b6bbb7b35edd8cd4f4577e2c97cba8b9fa