Merge branch 'master' of pc18:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 21 Mar 2008 15:17:34 +0000 (16:17 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 21 Mar 2008 15:17:34 +0000 (16:17 +0100)

Trivial merge