From: Senthil Kumaran <orsenthil@gmail.com>
Date: Thu, 17 Mar 2011 06:24:35 +0000 (+0800)
Subject: merge from 2.6 branch
X-Git-Tag: v2.7.2rc1~242
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e617307bc530b709279926a122d7d58a0a63566;p=thirdparty%2FPython%2Fcpython.git

merge from 2.6 branch
---

2e617307bc530b709279926a122d7d58a0a63566