Merge rsync://rsync.kernel.org/pub/scm/gitk/gitk