Merge from Thomas

diff --cc ChangeLog
index 4f72b591b03c7149670fdaf491d3b3fc78a90a48,76f68664701b7a2b09752b362f89fd70e61f4a7c..8aef43b7be077880aecf5b47706292670c2fe960
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -12,7 -20,7 +20,7 @@@
        dumps, using a scheme to keep more of the recent dumps.
  
        * config/debian/cron.daily: Use the new script. Also - compress
--      all files older than 7 days, instead of 30. 
++      all files older than 7 days, instead of 30.
  
        * dak/process_accepted.py (install): Do not break if a
        source/maintainer combination is already in src_uploaders, "just"

diff --cc daklib/queue.py
Simple merge