From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 9 Apr 2012 19:31:06 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0a3~269
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f93fc0411bef9bb1fc781cc76427b6e52c7affd9;p=python

Merge.
---

f93fc0411bef9bb1fc781cc76427b6e52c7affd9