Merge branch 'master' of linz:/srv/git/git-kairo
authorRobert Kaiser <kairo@kairo.at>
Wed, 1 Apr 2009 13:27:59 +0000 (15:27 +0200)
committerRobert Kaiser <kairo@kairo.at>
Wed, 1 Apr 2009 13:27:59 +0000 (15:27 +0200)

Trivial merge