From: Stefan Krah <skrah@bytereef.org>
Date: Fri, 8 Jun 2012 16:55:22 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0b1~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bf506cca56f5f7ab994ed67b3a8cb7ac897b5ec;p=python

Merge.
---

0bf506cca56f5f7ab994ed67b3a8cb7ac897b5ec