Merge remote branch 'twerner/msfl' into merge

* twerner/msfl:
  introduce defaultThreadCount
  add key Common::ThreadCount to dak.conf

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --combined config/debian/dak.conf
index 0f8e3fe269e86c1478ae7730c7b26a3f70010648,2eaccd7641b512c870650902e4e72942baef0e08..16120d8eb9dcefa8be65057feab9df069551fa50
--- 1/config/debian/dak.conf
--- 2/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@@ -494,7 -494,7 +494,7 @@@ D
  {
    Name "projectb";
    Host "";
 -  Port -1;
 +  Port 5433;
  };
  
  Architectures
@@@ -653,3 -653,9 +653,9 @@@ Content
    Header "contents";
    Root "/srv/ftp-master.debian.org/test/";
  }
+ 
+ Common
+ {
+   // The default number of threads for multithreading parts of dak:
+   ThreadCount 16;
+ }