Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 22 Dec 2007 06:16:34 +0000 (07:16 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 22 Dec 2007 06:16:34 +0000 (07:16 +0100)

Trivial merge