Merge from upstream

diff --combined ChangeLog
index 57e15e940e2500f9aaf6a9c6961b1113baad93e4,1ca4a408c3a7c98da409af90262dc9f58412f591..7c22507c89fec920b91a65817f80e4a7edc59245
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,8 +1,8 @@@
+ 2008-04-12  James Troup  <troup@debian.org>
+ 
+       * dak/clean_proposed_updates.py: add support for -s/--suite and
+       -n/--no-action.
+ 
  2008-04-11  Anthony Towns  <ajt@debian.org>
  
        * dak/utils.py: build_file_list() extra parameters so it can
@@@ -16,12 -21,6 +21,12 @@@
        adjusted to reject newer (and right now broken) 1.8 version, until
        dpkg (or debsign) is fixed and doesn't produce invalid .changes anymore
  
 +2008-03-22  Joerg Jaspert  <joerg@debian.org>
 +
 +      * dak/transitions.py (load_transitions): Check if all our keys are
 +      defined, if there are only keys defined we want and also the types
 +      of the various keys.
 +
  2008-03-22  Anthony Towns  <ajt@debian.org>
  
        * dak/edit_transitions.py: Add --import option.