Merge branch 'master' into debian-master

diff --cc config.sh.sed.in
index 8bd89ba81fd4133f66d6496e25b35081283df34a,09d080cb7638dee1065c96df2c3026d1ffab38bd..fae15fe712904089340fe893f9d054b03400bb17
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -45,15 -45,17 +45,15 @@@ ddtplangs="ca cs da de eo es eu fi fr h
  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 squeeze-backports sid experimental"
 +suites="lenny lenny-volatile lenny-backports squeeze squeeze-backports 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"
+ architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc powerpcspe s390 sh4 sparc sparc64"
 -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_sid="${arch_squeeze} avr32 hurd-i386 m68k powerpcspe sh4 sparc64"
  arch_experimental="${arch_sid}"
  arch_lenny_proposed_updates="${arch_lenny}"
 -arch_etch_proposed_updates="${arch_etch}"
  
  # Miscellaneous
  #

diff --cc templates/html/homepage.tmpl
Simple merge