[SCM] debian-live/live-initramfs branch, master, updated. 1.125.1-1-11-g2c4fc54

[Daniel Baumann]

The following commit has been merged in the master branch:
commit f700876017b8457b50c0b25017fce421e45af33c
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Mar 31 07:34:06 2008 +0200

    Merging casper 1.126.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 1c61861..d14f9c1 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,10 @@
+casper (1.126) hardy; urgency=low
+
+  * scripts/casper-bottom/10adduser: Test for konqueror not kdesktop,
+    stops putting a broken icon on the Kubuntu KDE 4 desktop
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 25 Mar 2008 15:42:31 +0000
+
 casper (1.125) hardy; urgency=low
 
   [ Colin Watson ]

-- 
debian-live/live-initramfs