Merge branch 'dpkg' of pc18:/srv/git/r/doldaconnect into dpkg