From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 5 Mar 2012 16:48:21 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.3.0a2~276^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e88f3faa61dbaa9ea0d2404aa8563c1eeceba54;p=python

Merge.
---

1e88f3faa61dbaa9ea0d2404aa8563c1eeceba54