Merge commit 'alioth/master' into debian-master

diff --combined config.sh.sed.in
index b6709c151399079db07e19f2987265789a9c3c1b,f9c1b071a136205684a0a565f509ec858cb458fc..b85a83b6de749bdb9be9824e98f47b0138cbb51e
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
 -#localdir=/org/ftp.debian.org/debian
 +localdir=/srv/mirrors/ftp.debian.org
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -51,7 -51,7 +51,7 @@@ dists="$suites
  architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
  arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
  arch_lenny="${arch_etch} armel"
- arch_squeeze="${arch_lenny}"
+ arch_squeeze="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
  arch_sid="${arch_squeeze} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k"
  arch_experimental="${arch_sid}"
  arch_lenny_proposed_updates="${arch_lenny}"