From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 4 Sep 2015 05:39:33 +0000 (+0300)
Subject: Fixed merge error.
X-Git-Tag: v3.6.0a1~1676
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f69104f15a49439170f91bdd86d6a19cdb26348a;p=thirdparty%2FPython%2Fcpython.git

Fixed merge error.
---

f69104f15a49439170f91bdd86d6a19cdb26348a