Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 27 May 2008 14:45:07 +0000 (16:45 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 27 May 2008 14:45:07 +0000 (16:45 +0200)

Trivial merge