From: Stefan Krah <skrah@bytereef.org>
Date: Fri, 23 Mar 2012 15:37:41 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.3.0a2~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0175af85a574800d8ea44e57fc9c0810edf2d0e1;p=python

Merge.
---

0175af85a574800d8ea44e57fc9c0810edf2d0e1