From: Christian Heimes <christian@cheimes.de>
Date: Mon, 10 Sep 2012 11:19:15 +0000 (+0200)
Subject: merge
X-Git-Tag: v2.7.5~109^2~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=059ba521806f9b6f8ed864929811f9850d71605d;p=python

merge
---

059ba521806f9b6f8ed864929811f9850d71605d