Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 6 Mar 2008 23:59:30 +0000 (00:59 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 6 Mar 2008 23:59:30 +0000 (00:59 +0100)

Trivial merge