Merge branch 'master' into ubuntu-master

Conflicts:
	config.sh.sed.in

diff --cc config.sh.sed.in
index b82322d8cf549b49f3813f07f2b5f853da57829f,4e228e46d8171c9f5ffd69937eca7fd27b752355..8ab6a25aed0748a270f31ee77592b188d11aeed4
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -37,30 -40,22 +37,30 @@@ search_url="/search
  
  # Architectures
  #
- polangs="de fi fr hu ja nl ru sv uk zh-cn"
+ polangs="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"
 +ddtplangs="be ca cs da de en-gb eo es et eu fi fr gl hu id it ja ka km ko lt ml nl oc pl pt pt-br ro ru sk sl sv tr uk vi zh-cn zh-hk zh-tw"
 +archives="us security"
 +sections="main multiverse restricted universe"
  parts="$sections"
 -suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze sid experimental"
 -priorities="required important standard optional extra"
 +suites="dapper dapper-updates dapper-backports hardy hardy-updates hardy-backports intrepid intrepid-updates intrepid-backports jaunty jaunty-updates jaunty-backports karmic"
  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_squeeze="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
 -arch_sid="${arch_squeeze} avr32 hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k"
 -arch_experimental="${arch_sid}"
 -arch_lenny_proposed_updates="${arch_lenny}"
 -arch_etch_proposed_updates="${arch_etch}"
 +priorities="required important standard optional extra"
 +architectures="i386 amd64 powerpc"
 +arch_dapper="i386 amd64 powerpc"
 +arch_dapper_updates="${arch_dapper}"
 +arch_dapper_backports="${arch_dapper}"
 +arch_hardy="i386 amd64"
 +arch_hardy_updates="${arch_hardy}"
 +arch_hardy_backports="${arch_hardy}"
 +arch_intrepid="${arch_hardy}"
 +arch_intrepid_updates="${arch_intrepid}"
 +arch_intrepid_backports="${arch_intrepid}"
 +arch_jaunty="${arch_intrepid}"
 +arch_jaunty_updates="${arch_jaunty}"
 +arch_jaunty_backports="${arch_jaunty}"
 +arch_karmic="${arch_jaunty}"
 +arch_karmic_updates="${arch_karmic}"
 +arch_karmic_backports="${arch_karmic}"
  
  # Miscellaneous
  #