Merge branch 'master' of pc18:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 19 Oct 2007 19:45:55 +0000 (21:45 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 19 Oct 2007 19:45:55 +0000 (21:45 +0200)

Trivial merge