[SCM] live-build branch, debian-next, updated. debian/3.0_a5-1-2-gac5d646

[Richard Nelson]

The following commit has been merged in the debian-next branch:
commit ac5d6463aad4fd4efd464dff5ceaf3952ca677d9
Author: Richard Nelson <unixabg at gmail.com>
Date:   Fri Oct 8 12:43:12 2010 -0500

    Make iso-hybrid default on l-b-cgi.

diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html
index 15e4a25..8febffe 100644
--- a/templates/cgi/debian-official/form.html
+++ b/templates/cgi/debian-official/form.html
@@ -25,7 +25,7 @@
 			<td><label for="Binary_Images">--binary-images:</label> </td>
 			<td>
 				<select id="Binary_Images" name="binary_images" size="1">
-					<option selected value="iso">iso</option>
+					<option selected value="iso-hybrid">iso-hybrid</option>
 					<option value="net">net</option>
 					<option value="tar">tar</option>
 					<option value="usb-hdd">usb-hdd</option>
diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html
index 27902fa..a83086f 100644
--- a/templates/cgi/debian-unofficial/form.html
+++ b/templates/cgi/debian-unofficial/form.html
@@ -24,7 +24,7 @@
 			<td><label for="Binary_Images">--binary-images:</label> </td>
 			<td>
 				<select id="Binary_Images" name="binary_images" size="1">
-					<option selected value="iso">iso</option>
+					<option selected value="iso-hybrid">iso-hybrid</option>
 					<option value="net">net</option>
 					<option value="tar">tar</option>
 					<option value="usb-hdd">usb-hdd</option>

-- 
live-build