Merge gitk changes from Paul Mackerras at git://ozlabs.org/~paulus/gitk