Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 21 Jun 2007 16:20:47 +0000 (16:20 +0000)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 21 Jun 2007 16:20:47 +0000 (16:20 +0000)

Trivial merge