Merge commit 'origin/master' into archive-master

Conflicts:

	config.sh.sed.in
	cron.d/100syncarchive
	cron.d/100syncarchive_backports
	cron.d/100syncarchive_volatile
	static/index.tmpl

diff --combined cron.d/120synctrans
index 5bfd9599b67452147708d787d5778b5f30f67b44,a40736f15cbf64a15ceb6829cb9c0378ab556726..705d7d097952d67ed5f8ffbcdb90f8245b454f75
--- 1/cron.d/120synctrans
--- 2/cron.d/120synctrans
+++ b/cron.d/120synctrans
@@@ -12,7 -12,7 +12,7 @@@ the
        ddtp_ftpsite="$ftpsite"
      fi
      echo using remote mirror $ddtp_ftpsite
 -    for dist in $dists
 +    for dist in sid
      do
        for part in main
        do
@@@ -28,7 -28,7 +28,7 @@@
      done
  else
      echo using local mirror
 -    for dist in $dists
 +    for dist in sid
      do
        for part in main
        do
@@@ -43,3 -43,5 +43,5 @@@
        done
      done
  fi
+ 
+ exit 0

diff --combined lib/Packages/Dispatcher.pm
index 35b04598f2a7b87824a41ca4f97541f57d0281e3,e2771b9fadd5df910fc1e0454484b86a0a1fc38d..0856ef4e4d9a458e00bb0a3a8ffd7b30ec6b5409
--- 1/lib/Packages/Dispatcher.pm
--- 2/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@@ -64,11 -64,10 +64,10 @@@ sub do_dispatch 
      delete $ENV{'LC_ALL'};
      delete $ENV{'LC_MESSAGES'};
  
-     my %SUITES_ALIAS = ( oldstable => 'sarge',
+     my %SUITES_ALIAS = ( #oldstable => 'sarge',
                         stable => 'etch',
                         testing => 'lenny',
                         unstable => 'sid',
-                        '3.1' => 'sarge',
                         '4.0' => 'etch' );
  
      # Read in all the variables set by the form
@@@ -94,7 -93,7 +93,7 @@@
      &Packages::DB::init();
      my $last_modified = $Packages::DB::db_read_time;
      my $now = time;
 -    my $expires = $last_modified + (12*3600);
 +    my $expires = $last_modified + (365*24*3600);
      $expires = $now + 3600 if $expires < $now;
      # allow some fudge, since the db mod time is not the end of
      # the cron job