Merge branch 'master' into debian-master

diff --cc config.sh.sed.in
index fe395be9cd5adeb2d8957915669f6538db62965e,d3dde1fc13613f073652e5c4894bc6d3ca2af36b..8bd89ba81fd4133f66d6496e25b35081283df34a
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -45,7 -45,7 +45,7 @@@ 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="lenny lenny-volatile lenny-backports squeeze sid experimental"
 -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"

diff --cc static/packages-site.css
index 7254f37b79afbea83299a157d02d176de0e185fe,dc09e55c72fe48cfa924dc0f36653470cdac14da..dcd43c5095bd4d547d72fd608163097518f7125c
--- 1/static/packages-site.css
--- 2/static/packages-site.css
+++ b/static/packages-site.css
@@@ -1,17 -1,4 +1,17 @@@
  .sarge-volatile, .sarge-backports, .etch-m68k, .etch-backports,
- .lenny-volatile, .lenny-backports {
+ .lenny-volatile, .lenny-backports .squeeze-backports {
        font-size: smaller;
  }
 +
 +table#sponsorslist {
 +      text-align: center;
 +      border: 1px solid black;
 +      padding: 1em;
 +      border-collapse: collapse;
 +      empty-cells: show;
 +}
 +
 +#sponsorslist th, #sponsorslist td {
 +      border: 1px solid black;
 +      padding: .5em;
 +}

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