From: Raymond Hettinger <python@rcn.com>
Date: Fri, 1 Mar 2013 11:31:05 +0000 (-0800)
Subject: Merge
X-Git-Tag: v3.4.0a1~1299
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0580cbb1640d38a98677e36bc0947b0ec1064c26;p=thirdparty%2FPython%2Fcpython.git

Merge
---

0580cbb1640d38a98677e36bc0947b0ec1064c26