Merge branch 'master' into security

* master:
  new-security-install

diff --combined ChangeLog
index 730146e4510bcb28832316ff358d002aa60110a5,a7c85ec4b4d1f4600ce52c5291df06940097aa11..2c3036feaeafe00aca11e99f07803c2d674a7b7b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,8 +1,8 @@@
+ 2008-11-05  Joerg Jaspert  <joerg@debian.org>
+ 
+       * dak/new_security_install.py (_do_Approve): This sudo call
+       definitely wants the -H option.
+ 
  2008-11-01  Joerg Jaspert  <joerg@debian.org>
  
        * dak/process_unchecked.py (check_files): Also check the
@@@ -538,7 -543,6 +543,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>