From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 17 Nov 2013 10:30:50 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.4.0b1~231
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f532d9419db9c5d00ba713f2838a5a7e36ac00ae;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

f532d9419db9c5d00ba713f2838a5a7e36ac00ae