merge head into this branch

debian/changelog

@@ -1,9 +1,13 @@
-livecd-rootfs (0.88ubuntu1) karmic; urgency=low
+livecd-rootfs (0.89) UNRELEASED; urgency=low
 
+  [ Michael Casadevall ]
   * Move armel to subarchitectures so we can support dove and
     subarchitecture. Made armel with no subarch default to imx51 
 
- -- Michael Casadevall <mcasadevall@ubuntu.com>  Wed, 05 Aug 2009 07:00:26 -0400
+  [ Steve Kowalik ]
+  * livecd.sh: Stop building UNR from universe.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Wed, 05 Aug 2009 20:32:19 +1000
 
 livecd-rootfs (0.88) karmic; urgency=low
 

livecd.sh

@@ -210,7 +210,6 @@ Flags: seen
 	ubuntu-netbook-remix)
 	    LIST="$LIST minimal^ standard^ ubuntu-netbook-remix^"
 	    LIVELIST="unr-live^ casper ubiquity"
-	    COMP="main restricted universe"
 	    ;;
 	mythbuntu)
 	    LIST="$LIST minimal^ standard^ mythbuntu-desktop^ mythbuntu-desktop"