Merge branch 'master' of /srv/ftp.debian.org/git/dak

Conflicts:

	ChangeLog

diff --cc ChangeLog
index f0837bda54b74365eeeb9802e3788349ac9e74ba,cc0c83022f05d9f853f307903aa0f1380f6a0f41..7d3a7ddf26f8f08debe599f510315d9446ac6bdc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,20 -1,7 +1,24 @@@
 +2008-09-13  Philipp Kern  <pkern@debian.org>
 +
 +      * dak/queue.py (dump_vars): make .dak u,g=rw,o=r; James'
 +      assumption (as stated in 2002-05-18's ChangeLog entry)
 +      was that people will use the information therein albeit
 +      it is "just" a duplication of information present in
 +      other control files; people should still not use it
 +      as source of information but access to those files makes
 +      dak debugging easier and there is no leak of sensitive
 +      information involved
 +
 +2008-09-12  Philipp Kern  <pkern@debian.org>
 +
 +      * dak/new_security_install.py (actually_upload): remove
 +      oldstable-security/amd64 check; Etch, as the next oldstable,
 +      already had proper amd64 support
 +
+ 2008-09-12  Joerg Jaspert  <joerg@debian.org>
+ 
+       * scripts/debian/update-pseudopackages.sh: s/i/file/
+ 
  2008-09-11  Joerg Jaspert  <joerg@debian.org>
  
        * config/debian/pseudo-packages.description, ...maintainers: