]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Thu, 5 May 2011 21:16:16 +0000 (14:16 -0700)
committerRaymond Hettinger <python@rcn.com>
Thu, 5 May 2011 21:16:16 +0000 (14:16 -0700)

Trivial merge