]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 23 Apr 2012 07:22:48 +0000 (00:22 -0700)
committerRaymond Hettinger <python@rcn.com>
Mon, 23 Apr 2012 07:22:48 +0000 (00:22 -0700)

Trivial merge