From: Kurt B. Kaiser <kbk@shore.net>
Date: Sat, 14 May 2011 21:31:54 +0000 (-0400)
Subject: Merge heads
X-Git-Tag: v3.3.0a1~2275^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b16ff2c44e709a7a7ea29ac0a6d41b8046c7f2d;p=python

Merge heads
---

4b16ff2c44e709a7a7ea29ac0a6d41b8046c7f2d