Merge commit 'origin/master' into archive-master

diff --cc lib/Deb/Versions.pm
index 606f75301335ec332d77943dd2a963d67114ddd8,2b4c5343440339f59a63aa672a30b061ce9ed315..eb83819b7e4794ab4efa0c40357dbbb304b9a9f9
--- 1/lib/Deb/Versions.pm
--- 2/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@@ -152,11 -152,10 +152,11 @@@ sub _lcmp 
      return length( $v1 ) <=> length( $v2 );
  }
  
 -our @SUITES_SORT = qw( woody oldstable sarge stable stable-proposed-updates
 +our @SUITES_SORT = qw( bo hamm slink potato woody
 +                     oldstable sarge stable stable-proposed-updates
                       etch etch-m68k testing testing-proposed-updates lenny
                       sid unstable experimental
-                      warty hoary breezy breezy dapper edgy feisty gutsy );
+                      warty hoary breezy dapper edgy feisty gutsy intrepid jaunty);
  our @ARCHIVE_SORT = qw( non-US security updates volatile backports );
  our @PRIORITY_SORT = qw( required important standard optional extra );
  my $i = 1000;

diff --cc static/index.tmpl
Simple merge