]> granicus.if.org Git - python/commitdiff
merge heads
authorSenthil Kumaran <senthil@uthcode.com>
Sun, 22 Apr 2012 01:19:49 +0000 (09:19 +0800)
committerSenthil Kumaran <senthil@uthcode.com>
Sun, 22 Apr 2012 01:19:49 +0000 (09:19 +0800)

Trivial merge