TODO: Find a place for gitk and friends
Merge branch 'master' of sym.noone.org:git/abe-metapackages