From: Raymond Hettinger <python@rcn.com>
Date: Tue, 24 Jun 2014 20:03:24 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.2rc1~331
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c945fe9e9ea813ecb19ed705e1c7b3ae26b0d2a;p=thirdparty%2FPython%2Fcpython.git

merge
---

4c945fe9e9ea813ecb19ed705e1c7b3ae26b0d2a