From: Stefan Krah <skrah@bytereef.org>
Date: Sat, 30 Jun 2012 16:42:32 +0000 (+0200)
Subject: Null merge.
X-Git-Tag: v3.3.0b2~353^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=536f1b909cd6ffd98186c3b604a55c1a42b8f9ce;p=python

Null merge.
---

536f1b909cd6ffd98186c3b604a55c1a42b8f9ce