Merge branch 'master' of nerv:/usr/local/src/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 5 Nov 2009 16:03:17 +0000 (17:03 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 5 Nov 2009 16:03:17 +0000 (17:03 +0100)

Trivial merge