Merge branch 'master' of inode:/srv/git/git-kairo
authorRobert Kaiser <kairo@kairo.at>
Mon, 1 Oct 2007 15:54:15 +0000 (17:54 +0200)
committerRobert Kaiser <kairo@kairo.at>
Mon, 1 Oct 2007 15:54:15 +0000 (17:54 +0200)

Trivial merge