Merge branch 'christian' of git://repo.or.cz/git-cheetah