From: Raymond Hettinger <python@rcn.com>
Date: Sat, 2 Mar 2013 07:51:26 +0000 (-0800)
Subject: Merge
X-Git-Tag: v3.4.0a1~1291
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a35e281200c16e3c725462463562c6928f38c54f;p=thirdparty%2FPython%2Fcpython.git

Merge
---

a35e281200c16e3c725462463562c6928f38c54f