Merge branches

diff --cc debian/changelog
index 41110eb,1d19b11..8ac80a6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -4,9 -4,8 +4,11 @@@ grml-live (0.0.6) unstable; urgency=lo
      grml(32) on amd64.
    * Fix stderr redirection in "/usr/sbin/fai already running..."
    * Update /etc/grml/fai/make-fai-nfsroot.conf
 +  * Use /var/log/fai/dirinstall/${HOSTNAME}/grml-live.log as logfile
 +    for grml-live instead of /var/log/grml-live.log so it's easier
 +    to track.
+   * Update of buildd scripts: main configuration file main.sh
+     which provides all the build stuff inside separate functions.
  
   -- Michael Prokop <mika@grml.org>  Wed, 17 Oct 2007 22:59:08 +0200