From: Raymond Hettinger <python@rcn.com>
Date: Sat, 3 May 2014 22:26:17 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1747
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b5eebcfa3e5d21c14e89dc7e5bf2d124f8710a2;p=thirdparty%2FPython%2Fcpython.git

merge
---

1b5eebcfa3e5d21c14e89dc7e5bf2d124f8710a2