From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 29 Nov 2012 17:52:21 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v2.7.5~109^2~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07d126f0def56eb369dbb9602ac922b8c6e0d032;p=python

merge heads
---

07d126f0def56eb369dbb9602ac922b8c6e0d032