From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Fri, 22 Nov 2013 20:55:59 +0000 (-0700)
Subject: Merge heads.
X-Git-Tag: v3.4.0b1~102^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f66ffa652e1695d39b6c9ba42c9b97da7a7f962;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

2f66ffa652e1695d39b6c9ba42c9b97da7a7f962