From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 21 Feb 2012 16:24:21 +0000 (-0500)
Subject: merge 2.6
X-Git-Tag: v2.7.3rc1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d7601fcea7c9cee6132c4a4dffb482cfa351785;p=python

merge 2.6
---

9d7601fcea7c9cee6132c4a4dffb482cfa351785