From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 5 Apr 2012 14:25:21 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0a3~300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0130ad14dd6e9f08590db93cb6a9cb059118dc7c;p=python

Merge.
---

0130ad14dd6e9f08590db93cb6a9cb059118dc7c