Merge branch 'master' into toutatis

makepending

@@ -26,9 +26,9 @@ then
     [ 1$1 = 1"test" ] || exit 1
 fi
 
-PAIRS="robur-hardy taranis-lucid dagda-natty brigantia-oneiric toutatis-precise"
-CODENAMES="robur taranis dagda brigantia toutatis"
-UPSTREAMS="hardy lucid natty oneiric precise"
+PAIRS="taranis-lucid toutatis-precise"
+CODENAMES="taranis toutatis"
+UPSTREAMS="lucid precise"
 
 [ 1$1 = 1"test" ] && TEST=echo