From: Steven Bethard <steven.bethard@gmail.com>
Date: Mon, 4 Apr 2011 00:14:25 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a1~2680
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58f41c27bc16b733db8508415269253dd50fa139;p=python

Merge
---

58f41c27bc16b733db8508415269253dd50fa139