From: Raymond Hettinger <python@rcn.com>
Date: Sun, 4 Aug 2013 19:43:59 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a2~301
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28dc9b9fc01f46401f1e085f9993ca4b429b154e;p=thirdparty%2FPython%2Fcpython.git

merge
---

28dc9b9fc01f46401f1e085f9993ca4b429b154e