Merge branch 'master' into security

* master:
  new lock dir
  embargo/disembargo build up a symlink farm for our buildds.

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

diff --cc config/debian-security/dak.conf
index a693bfc458ea13279456889b50666d002108a53e,0f77a7f49e61b9286f13890a8932d36d8bda4318..f188359c86232e679e3b01d785731e4389dd8572
--- 1/config/debian-security/dak.conf
--- 2/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@@ -38,7 -38,8 +38,8 @@@ Dinstal
  
  Process-New
  {
 -  AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
 +  AcceptedLockFile "/srv/security-master.debian.org/lock/unchecked.lock";
+   LockDir "/srv/security-master.debian.org/lock/new/";
  };
  
  Import-Users-From-Passwd