]> granicus.if.org Git - python/commitdiff
merge from push conflict.
authorSenthil Kumaran <orsenthil@gmail.com>
Wed, 13 Apr 2011 01:38:51 +0000 (09:38 +0800)
committerSenthil Kumaran <orsenthil@gmail.com>
Wed, 13 Apr 2011 01:38:51 +0000 (09:38 +0800)

Trivial merge