]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sat, 25 Jun 2011 09:50:00 +0000 (11:50 +0200)
committerRaymond Hettinger <python@rcn.com>
Sat, 25 Jun 2011 09:50:00 +0000 (11:50 +0200)

Trivial merge