]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Wed, 13 Apr 2011 18:50:34 +0000 (11:50 -0700)
committerRaymond Hettinger <python@rcn.com>
Wed, 13 Apr 2011 18:50:34 +0000 (11:50 -0700)

Trivial merge