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 --cc config/backports.org/cron.hourly
Simple merge