Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 4 Jul 2007 23:46:02 +0000 (01:46 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 4 Jul 2007 23:46:02 +0000 (01:46 +0200)

Trivial merge