Import patches-unapplied version 1.158 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 3949289635

New changelog entries:
  * switch default session for armel netbook images to unity-2d

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (1.158) natty; urgency=low
+
+  * switch default session for armel netbook images to unity-2d
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 15 Feb 2011 18:20:57 +0100
+
 livecd-rootfs (1.157) natty; urgency=low
 
   * drop IGEPv2 x-loader and u-boot from livefs.sh, they are not in main 

livecd.sh

@@ -719,8 +719,8 @@ Pin-Priority: 550
 
     if [ "$FS" = ubuntu-netbook ] && \
        [ "$TARGETARCH" = armel ] && \
-       [ -e "$ROOT/usr/share/xsessions/une-efl.desktop" ]; then
-        chroot $ROOT /usr/lib/gdm/gdm-set-default-session une-efl
+       [ -e "$ROOT/usr/share/xsessions/unity-2d.desktop" ]; then
+        chroot $ROOT /usr/lib/gdm/gdm-set-default-session unity-2d
     fi
 
     # all done with the chroot; reset the debconf frontend, so Colin doesn't cry