Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 26 Jun 2007 15:32:45 +0000 (17:32 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 26 Jun 2007 15:32:45 +0000 (17:32 +0200)

Trivial merge