From: Éric Araujo <merwok@netwok.org>
Date: Wed, 12 Mar 2014 23:51:50 +0000 (-0400)
Subject: Merge 3.3 (#16805)
X-Git-Tag: v3.4.1rc1~233^2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abdc16ee1bb9819ecc6500a8f1d8720fc2072643;p=thirdparty%2FPython%2Fcpython.git

Merge 3.3 (#16805)
---

abdc16ee1bb9819ecc6500a8f1d8720fc2072643