Merge git://ozlabs.org/~paulus/gitk