]> granicus.if.org Git - python/commitdiff
Merge from 3.2
authorNick Coghlan <ncoghlan@gmail.com>
Thu, 5 May 2011 14:03:49 +0000 (00:03 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Thu, 5 May 2011 14:03:49 +0000 (00:03 +1000)

Trivial merge