From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 28 Feb 2014 14:47:15 +0000 (+0100)
Subject: Merge heads
X-Git-Tag: v3.4.1rc1~233^2~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c17ff91f347704fd0fc7439675d84370db8b75a;p=python

Merge heads
---

9c17ff91f347704fd0fc7439675d84370db8b75a