Merge branch 'master' into ubuntu-master

diff --combined lib/Deb/Versions.pm
index 62aa0b8a529851af068f926d097bc8a2204349fb,50b5ccb71683641cb1aec83bf1f8a6ea715f59ce..f52221de2ff6a33686135fc799cdacf3b9f9f33b
--- 1/lib/Deb/Versions.pm
--- 2/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@@ -165,7 -165,12 +165,12 @@@ sub _lcmp 
      return length( $v1 ) <=> length( $v2 );
  }
  
- our @SUITES_SORT = qw(  woody
+ our @SUITES_SORT = qw(  
+                       bo
+                       hamm
+                       slink
+                       potato
+                       woody
                        sarge
                        oldstable
                        etch etch-m68k
@@@ -174,8 -179,7 +179,8 @@@
                        testing testing-proposed-updates
                        squeeze
                        sid unstable experimental
 -                      warty hoary breezy dapper edgy feisty gutsy hardy intrepid jaunty);
 +                      warty hoary breezy dapper edgy feisty gutsy hardy
 +                      intrepid jaunty karmic);
  our @ARCHIVE_SORT = qw( non-US security updates volatile backports );
  our @PRIORITY_SORT = qw( required important standard optional extra );
  my $i = 1000;