[SCM] debian-live branch, master, updated. 1.0_a47-1-69-ge0160b3

[Chris Lamb]

The following commit has been merged in the master branch:
commit e0160b3eaf892ee4593ceb3f8206166a4dfa755c
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Wed Jul 9 15:40:57 2008 +0100

    Fix syntax error in --ignore-system-defaults handling.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_config b/helpers/lh_config
index d4a1009..310c7ca 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -659,7 +659,7 @@ Local_arguments ()
 }
 
 # Reading system configuration
-if [ -f "${SYSTEM_LH_CONFFILE}" ] && if ! In_list "--ignore-system-defaults" "${@}"
+if [ -f "${SYSTEM_LH_CONFFILE}" ] && ! In_list "--ignore-system-defaults" "${@}"
 then
 	Echo_message "Using system defaults from ${SYSTEM_LH_CONFFILE}"
 	Read_conffile "${SYSTEM_LH_CONFFILE}"

-- 
debian-live