Merge branch 'master' of pc18:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 31 Oct 2007 05:00:03 +0000 (06:00 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 31 Oct 2007 05:00:03 +0000 (06:00 +0100)

Trivial merge