Merge branch 'master' into security

* master:
  defaultsuite stuff

diff --combined ChangeLog
index 8c7ce8a40ef2446994239b90591d884cc1e5b774,31085d640649ee71878fa746e66f7a157e4bbcd9..730146e4510bcb28832316ff358d002aa60110a5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,11 +1,11 @@@
+ 2008-11-01  Joerg Jaspert  <joerg@debian.org>
+ 
+       * dak/process_unchecked.py (check_files): Also check the
+       upload_suite for uploads. I guess we could kill the default_suite
+       totally, but for now we just look into the upload_suite one too.
+ 
+       * config/debian-security/dak.conf: Let DefaultSuite be stable
+ 
  2008-10-27  Joerg Jaspert  <joerg@debian.org>
  
        * scripts/debian/mkfilesindices: Remove oldstable
@@@ -530,7 -538,6 +538,7 @@@
        * dak/stats.py: likewise
        * dak/symlink_dists.py: likewise
        * dak/transitions.py: likewise
 +>>>>>>> sec-merge:ChangeLog
  
  2008-05-03  Joerg Jaspert  <joerg@debian.org>