Merge branch 'master' into bpo

* master: (1277 commits)
  rm.py: also take udebs into account while checking rdeps
  Indent reason
  add indentation to reason for 822 format
  Some code cleanups
  config/debian/apache.conf-incoming: add vitry and krenek
  cron.hourly: generate removals-full.822
  rm.py: implement rfc822 removal format
  queue.py: fix more error handling code
  queue.py: fix error handling code
  rm822.py script to convert removals log into rfc822 format
  Add more buildds
  config/debian/apache.conf-incoming: cleanup a bit
  config/debian/apache.conf-incoming: add new armel buildds
  [mhy] Remove malo and add poulenc/porpora
  Add the web-users dir and a rewriterule for it
  We can't allow unchecked until we've hardlinked the mirrors now that we're doing apt-ftparchive as part of it
  Run without -i
  Timestamps
  generate-filelist: create fewer DB sessions
  run g-p-s in unchecked
  ...

diff --combined config/backports.org/cron.hourly
index 06dd47bda7a49b526095b36aa79d5b4ec67bcb1d,b5e0646270f135ece609196817b1adeb369e6ac5..a43c62c1cdc572d07145fe8c2007daff30e3092c
--- 1/config/backports.org/cron.hourly
--- 2/config/backports.org/cron.hourly
+++ b/config/backports.org/cron.hourly
@@@ -53,6 -53,7 +53,7 @@@ symlinks -d -r $ftpdi
  
  cd $masterdir
  dak make-suite-file-list
+ dak generate-filelist
  
  # Generate override files
  cd $overridedir
@@@ -66,8 -67,6 +67,8 @@@ dak generate-index-diff
  # Generate Release files
  dak generate-releases
  
 +dak make-pkg-file-mapping | bzip2 -9 > $base/ftp/indices/package-file.map.bz2
 +
  # Clean out old packages
  # Now in cron.daily. JJ[03.05.2005.]
  #rhona