[SCM] live-magic branch, master, updated. 1.12-6-g161ae2a

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 14db8322301c4e271c7d663f1f7df974791dd4c2
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Sep 25 19:10:00 2010 +0200

    Replacing references to live-helper with live-build in live-magic manpage.

diff --git a/live-magic.1 b/live-magic.1
index 02a33af..6d39e42 100644
--- a/live-magic.1
+++ b/live-magic.1
@@ -4,12 +4,12 @@ live-magic \- GUI configuration utility for creating Debian Live systems.
 .SH SYNOPSIS
 .B live-magic \<configuration_dir\>
 .SH DESCRIPTION
-Live-helper is a collection of programs that can be used to build Debian Live
-system images. The philosophy behind live-helper is to provide a collection of
+live-build is a collection of programs that can be used to build Debian Live
+system images. The philosophy behind live-build is to provide a collection of
 small, simple, and easily understood tools that can be used in your own program
 to automate building of a Live system.
 .PP
-The \fBlive-magic\fP utility is a graphical user interface to live-helper that
+The \fBlive-magic\fP utility is a graphical user interface to live-build that
 features a wizard-based interface along with a more powerful graphical configuration
 editor.
 .SH AUTHOR

-- 
live-magic