From: Łukasz Langa <lukasz@langa.pl>
Date: Mon, 1 Jul 2013 14:03:17 +0000 (+0200)
Subject: Merge with current default
X-Git-Tag: v3.4.0a1~347
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c1457bed24f06cf793fee4536301540b5d327d4;p=python

Merge with current default
---

7c1457bed24f06cf793fee4536301540b5d327d4