Merge branch 'master' into debian-master

diff --combined config.sh.sed.in
index a7e334a4944dc328fcc4b96dd1d94aa990075eeb,55ba5b36a87b15bdf874a45f7a2c2d6ef5422ec6..e4694062ab677251997a5b038d8a17f03501eae2
--- 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
@@@ -40,20 -40,22 +40,20 @@@ search_url="/search
  
  # Architectures
  #
- polangs="de fi fr hu ja nl ru sk sv uk zh-cn"
+ polangs="bg de fi fr hu ja nl ru sk sv uk zh-cn"
  ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv uk zh zh-cn zh-tw"
  archives="us security debports backports volatile"
  sections="main contrib non-free"
  parts="$sections"
 -suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze sid experimental"
 +suites="lenny lenny-volatile lenny-backports squeeze sid experimental"
  priorities="required important standard optional extra"
  dists="$suites"
  architectures="alpha amd64 arm armel avr32 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_lenny="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
  arch_squeeze="alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc"
  arch_sid="${arch_squeeze} avr32 hurd-i386 m68k"
  arch_experimental="${arch_sid}"
  arch_lenny_proposed_updates="${arch_lenny}"
 -arch_etch_proposed_updates="${arch_etch}"
  
  # Miscellaneous
  #