Merge branch 'master' of pc18:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 17 Apr 2008 14:37:59 +0000 (16:37 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 17 Apr 2008 14:37:59 +0000 (16:37 +0200)

Trivial merge