From: Raymond Hettinger <python@rcn.com>
Date: Sun, 2 Jun 2013 17:04:59 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a1~583
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=697fd46d152e0d9ef77ddb46cfad36d0777c1409;p=thirdparty%2FPython%2Fcpython.git

merge
---

697fd46d152e0d9ef77ddb46cfad36d0777c1409