From: Senthil Kumaran <senthil@uthcode.com>
Date: Wed, 12 Sep 2012 05:16:58 +0000 (-0700)
Subject: Automated merge with file:///home/vagrant/3.2
X-Git-Tag: v2.7.4rc1~566
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f2cc6c3903d588466d2dbfe2e6d25656e8501d4;p=thirdparty%2FPython%2Fcpython.git

Automated merge with file:///home/vagrant/3.2
---

9f2cc6c3903d588466d2dbfe2e6d25656e8501d4