Import patches-unapplied version 2.264 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 791c1d95fc

New changelog entries:
  * live-build/auto/config:
    - also install flash-kernel/u-boot-tools in the armhf system-image,
      thanks to Adam Conrad

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.264) vivid; urgency=low
+
+  * live-build/auto/config:
+    - also install flash-kernel/u-boot-tools in the armhf system-image,
+      thanks to Adam Conrad
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 03 Nov 2014 11:45:00 +0100
+
 livecd-rootfs (2.263) vivid; urgency=medium
 
   * live-build/auto/config:

live-build/auto/config

@@ -349,8 +349,12 @@ case $PROJECT in
 		        add_package install dbus
 		        add_package install libpam-systemd
                         case $ARCH in
-				i386|amd64)	
-			        add_package install grub-pc ;;
+			    i386|amd64)	
+			        add_package install grub-pc
+                                ;;
+                            armhf)
+                                add_package install flash-kernel u-boot-tools
+                                ;;
                         esac
 
                         # generic kernel on amd64/arm for now