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

merge
---

b3325a18ae7b493e6cd77a6ed58a3d4a2c58d3a1