Merge branch 'master' of linz:/srv/git/git-kairo
authorRobert Kaiser <kairo@kairo.at>
Sun, 16 May 2010 22:05:04 +0000 (00:05 +0200)
committerRobert Kaiser <kairo@kairo.at>
Sun, 16 May 2010 22:05:04 +0000 (00:05 +0200)

Trivial merge