Merge branch 'master' into security

* master:
  dak.conf
  unchecked
  Create tracefile according to new format

diff --combined ChangeLog
index 2c3036feaeafe00aca11e99f07803c2d674a7b7b,3c68e7580e29a6451320ccbe0ab03bb5a34ad14d..a2e9ed6eeb0d5d2b754c119ccd0679a0db9fa998
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,17 +1,17 @@@
+ 2008-11-11  Joerg Jaspert  <joerg@debian.org>
+ 
+       * config/debian/dak.conf: good bye oldstable/o-p-u
+ 
+ 2008-11-10  Joerg Jaspert  <joerg@debian.org>
+ 
+       * config/debian/cron.unchecked: how about us ignoring bugs.d.o
+       down? It's not like it is time critical or something to transfer
+       this stuff, it doesn't hurt to have it there a bit later...
+ 
+ 2008-11-08  Joerg Jaspert  <joerg@debian.org>
+ 
+       * config/debian/cron.hourly: Create new tracefile format.
+ 
  2008-11-05  Joerg Jaspert  <joerg@debian.org>
  
        * dak/new_security_install.py (_do_Approve): This sudo call
@@@ -543,7 -557,6 +557,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>