From: Ned Deily <nad@acm.org>
Date: Sun, 5 Aug 2012 22:16:04 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.3.0b2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3af26174016fc5547a36fba37cacfaeaac9a9b6e;p=python

merge heads
---

3af26174016fc5547a36fba37cacfaeaac9a9b6e