Merge branch 'master' of linz:/srv/git/git-kairo
authorRobert Kaiser <kairo@kairo.at>
Fri, 22 Oct 2010 13:26:32 +0000 (15:26 +0200)
committerRobert Kaiser <kairo@kairo.at>
Fri, 22 Oct 2010 13:26:32 +0000 (15:26 +0200)

Trivial merge