Merge branch 'master' into new

diff --cc gitk
index 6cefc8721846fd2a2a97a816d240d8a4cb8336c1,5362b76bee5ad0ee13964634ac12e7d73b85cdbb..4ee51223b7cd08a3972a245b33545139cff26597
--- 1/gitk
--- 2/gitk
+++ b/gitk
@@@ -1769,8 -1484,8 +1770,8 @@@ proc drawcmittext {id row col rmx} 
  
  proc drawcmitrow {row} {
      global displayorder rowidlist
 -    global idrowranges idrangedrawn iddrawn
 +    global idrangedrawn iddrawn
-     global commitinfo commitlisted parentlist numcommits
+     global commitinfo parentlist numcommits
  
      if {$row >= $numcommits} return
      foreach id [lindex $rowidlist $row] {