Merge branches

diff --cc debian/changelog
index d6162d8,00ce1b4..fe386f9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -5,9 -5,9 +5,11 @@@ grml-live (0.0.5) unstable; urgency=lo
      - grml-live_autobuild_grml-small_sid.sh
      - grml-live_autobuild_grml64-small_etch.sh
      - grml-live_autobuild_grml64-small_sid.sh
+   * Some more FAI error checking.
+   * Update buildd scripts (better subject handling).
    * Add new packages to GRML_FULL:
 +    - ack-grep
 +    - mailplate
      - pristine-tar
  
   -- Michael Prokop <mika@grml.org>  Sun, 07 Oct 2007 23:06:28 +0200