Import patches-unapplied version 1.154 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 8e17cb0f24

New changelog entries:
  * apply setting of the default session to all ubuntu-armel builds
    so we do not need to do this on first boot.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (1.154) natty; urgency=low
+
+  * apply setting of the default session to all ubuntu-armel builds
+    so we do not need to do this on first boot.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 10 Jan 2011 23:27:43 +0100
+
 livecd-rootfs (1.153) natty; urgency=low
 
   * Update default suite in BuildLiveCD to natty.

livecd.sh

@@ -712,7 +712,7 @@ Pin-Priority: 550
     fi
 
     if [ "$FS" = ubuntu-netbook ] && \
-       [ "$TARGETARCH+$SUBARCH" = armel+dove ] && \
+       [ "$TARGETARCH" = armel ] && \
        [ -e "$ROOT/usr/share/xsessions/une-efl.desktop" ]; then
         chroot $ROOT /usr/lib/gdm/gdm-set-default-session une-efl
     fi