From: Senthil Kumaran <orsenthil@gmail.com>
Date: Thu, 17 Mar 2011 09:05:04 +0000 (+0800)
Subject: Recording the merge.
X-Git-Tag: v3.2.1b1~264
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2760a0bc5166f61180e5ed7e25bcf4132c68e62;p=python

Recording the merge.
---

b2760a0bc5166f61180e5ed7e25bcf4132c68e62