Merge branch 'master' of git://ozlabs.org/~paulus/gitk