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

merge
---

b4f39eea497fc5374835efb70261a3dc9211e810