[SCM] Debian Live build scripts branch, master, updated. 1.0.0-2-31-g97a22bc

[Chris Lamb]

The following commit has been merged in the master branch:
commit 97a22bcae4dab095109b47af63e00ebc26877796
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Sep 9 20:24:36 2008 +0100

    Removing packages from rescue list where they 'Conflict:' with each other.

diff --git a/lists/rescue b/lists/rescue
index 7bc149f..b4e1bea 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -37,7 +37,7 @@ syslinux-common
 #endif
 #if ARCHITECTURE i386
 pstack
-grub-pc syslinux mbr
+syslinux mbr
 #endif
 
 # Editors
@@ -116,7 +116,6 @@ strongswan
 sipcalc
 socat
 ssh
-telnet
 telnet-ssl
 whois
 irssi

-- 
Debian Live build scripts