From: Christian Heimes <christian@cheimes.de>
Date: Sat, 20 Jul 2013 23:54:36 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.4.0a1~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ded80d9096a160b35a5e68fbe8fb6863626abac;p=python

merge
---

8ded80d9096a160b35a5e68fbe8fb6863626abac