Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 30 Sep 2007 01:22:54 +0000 (03:22 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 30 Sep 2007 01:22:54 +0000 (03:22 +0200)

Trivial merge