From: Raymond Hettinger <python@rcn.com>
Date: Tue, 5 Mar 2013 06:37:02 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.4.0a1~1277
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e516604f7c83eeba7737347cf2d58d86c5cd5361;p=thirdparty%2FPython%2Fcpython.git

merge
---

e516604f7c83eeba7737347cf2d58d86c5cd5361