Merge branch 'master' into debian-master

diff --combined config.sh.sed.in
index f554b1650f6d1c68aaaf36e6922f4df938df43da,576ba3f6ec9acda7913d15316c5a9f38673e16b7..5d58e8413421b568090defa2062afa7199e255c9
--- 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=/org/ftp.root/debian
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -49,7 -49,7 +49,7 @@@ dists="$suites
  architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
  arch_sarge="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
  arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
- arch_lenny="${arch_etch}"
+ arch_lenny="${arch_etch} armel"
  arch_sid="${arch_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64"
  arch_experimental="${arch_sid}"
  arch_lenny_proposed_updates="${arch_lenny}"