Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 8 Mar 2008 14:34:06 +0000 (15:34 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 8 Mar 2008 14:34:06 +0000 (15:34 +0100)

Trivial merge