From: Brett Cannon <brett@python.org>
Date: Thu, 26 Jan 2012 23:36:08 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.2.3rc1~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=722db7bdba74c3c82ecd8b2d44daf1e2508b6734;p=python

merge
---

722db7bdba74c3c82ecd8b2d44daf1e2508b6734