Merge branch 'master' of inode:/srv/git/git-kairo
authorRobert Kaiser <robert@notebook.box.kairo.at>
Tue, 9 Sep 2008 17:06:39 +0000 (19:06 +0200)
committerRobert Kaiser <robert@notebook.box.kairo.at>
Tue, 9 Sep 2008 17:06:39 +0000 (19:06 +0200)

Trivial merge