Merge branch 'master' of pc18:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 18 Feb 2008 14:40:18 +0000 (15:40 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 18 Feb 2008 14:40:18 +0000 (15:40 +0100)

Trivial merge