From: Raymond Hettinger <python@rcn.com>
Date: Fri, 17 May 2013 10:24:54 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a1~704
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f6fe518601eb23880d8f925cd1dcd33e83f7310;p=thirdparty%2FPython%2Fcpython.git

merge
---

2f6fe518601eb23880d8f925cd1dcd33e83f7310