From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 7 Dec 2013 01:12:51 +0000 (-0500)
Subject: merge 3.3 (#19910)
X-Git-Tag: v3.4.0b2~314
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d45a46b60d2dc4616d681567d32482a1ad2c8c0c;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#19910)
---

d45a46b60d2dc4616d681567d32482a1ad2c8c0c