Import patches-unapplied version 2.69 to ubuntu/quantal

Imported using git-ubuntu import.

Changelog parent: a83cc8b766

New changelog entries:
  * live-build/auto/config: Add server task to ubuntu-server images.

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.69) quantal; urgency=low
+
+  * live-build/auto/config: Add server task to ubuntu-server images.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 06 Jul 2012 12:39:46 +0100
+
 livecd-rootfs (2.68) quantal; urgency=low
 
   * live-build/auto/config: Emit sources.list entries for -proposed if the

live-build/auto/config

@@ -194,7 +194,7 @@ case $PROJECT in
 		;;
 
 	ubuntu-server)
-		add_task install minimal standard
+		add_task install minimal standard server
 		COMPONENTS='main'
 		PREINSTALL_POOL_SEEDS='server-ship'
 		;;