]> granicus.if.org Git - python/commitdiff
Merge
authorRaymond Hettinger <python@rcn.com>
Sun, 30 Oct 2011 21:33:31 +0000 (14:33 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 30 Oct 2011 21:33:31 +0000 (14:33 -0700)

Trivial merge