From: Brett Cannon <brett@python.org>
Date: Thu, 16 Feb 2012 23:03:47 +0000 (-0500)
Subject: Merge
X-Git-Tag: v3.3.0a1~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22e7c88057ee91ded2bd9853a6b67846c34d392f;p=thirdparty%2FPython%2Fcpython.git

Merge
---

22e7c88057ee91ded2bd9853a6b67846c34d392f