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

Trivial merge