[SCM] debian-live branch, master, updated. 1.136.3-1-41-g57c11f5

[Chris Lamb]

The following commit has been merged in the master branch:
commit 57c11f5e8dca9bca90b46be65fe0865b639e279f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Aug 14 01:26:38 2008 +0100

    Modify hiding of harmless X.org reconfiguring messages.
    
    Was being split over a newline.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 153732a..3e927a3 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -83,7 +83,8 @@ ${setoptions}
 EOF
 
 DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg 2>&1 \
-	| grep -v "overwriting possibly-customised configuration file"
+	| grep -v "overwriting possibly-customised configuration" \
+	| grep -v "file; backup in /etc/X11/xorg.conf"
 umount /root/sys
 umount /root/proc
 umount /root/dev

-- 
debian-live