merge lp:~gilir/livecd-rootfs/lubuntu-non-pae

debian/changelog

@@ -1,8 +1,12 @@
 livecd-rootfs (2.61) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Use lowlatency for Ubuntu Studio amd64, since lowlatency-pae is
     i386-specific (LP: #959011).
 
+  [ Julien Lavergne ]
+  * Use generic (non-PAE) kernel for Lubuntu (LP: #958866).
+
  -- Colin Watson <cjwatson@ubuntu.com>  Mon, 19 Mar 2012 12:43:28 +0000
 
 livecd-rootfs (2.60) precise; urgency=low

live-build/auto/config

@@ -164,6 +164,7 @@ case $PROJECT in
 		add_task install minimal standard lubuntu-desktop
 		LIVE_TASK='lubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
+		KERNEL_FLAVOURS=generic
 
 		# The Lubuntu STRUCTURE file has "feature
 		# no-follow-recommends".  Mirror this.