Merged

diff --cc debian/changelog
index f6eff5c,e84bee2..1f30d4c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,38 +1,47 @@@
 +grml-live (0.0.11) unstable; urgency=low
 +
 +  * Add new class XORG.
 +  * Add X.org packages to GRML_MEDIUM.
 +  * Make sure /etc/X11/X is not a symlink to /bin/true. Check and fix
 +    via /etc/grml/fai/config/scripts/GRMLBASE/32-xorg.
 +
 + -- Michael Prokop <mika@grml.org>  Mon, 26 Nov 2007 15:07:54 +0100
 +
  grml-live (0.0.10) unstable; urgency=low
  
+   * Drop patches which are part of FAI 3.2.3 now. Depend on
+     FAI version 3.2.3 therefor.
+   * FAI 3.2.3 has a new log schema, adjusted grml-live accordingly.
+     Quoting the NEWS file of FAI:
+     - LOGDIR is now /var/log/fai/$HOSTNAME/$FAI_ACTION_date+time
+     - LOGDIR is /tmp/fai during an installation (not dirinstall), and
+       will be copied to the path above at the end of an installation
+   * Log the executed FAI, squashfs and mkisofs command lines to
+     /var/log/grml-live.log.
+   * New option '-C <configuration_file>' for specifying a configuration
+     file. Needs heavy testing though, because the files are updated
+     during runtime it isn't as easy as expected to be. :-/
+   * Support $ZERO_FAI_LOGFILE inside grml-live configuration for removing
+     old FAI logs.
    * Do not enable apt-listbugs if the binary is not available.
      [Testing: issue340]
-   * Add keychain package to GRML_MEDIUM.
    * Add keychain package to GRML_SMALL.
+   * Add new packages to GRML_MEDIUM:
+     - grml-live
+     - keychain
+     - lzma-modules-2.6.23-grml
+     - squashfs-modules-2.6.23-grml (we build the module external now)
+   * Add new packages to GRML_FULL:
+     - aosd-cat
+     - grml-live
+     - lzma-modules-2.6.23-grml
+     - squashfs-modules-2.6.23-grml (we build the module external now)
+   * Support loading of squashfs module via
+     /etc/grml/fai/live-initramfs/grml-script.init-top
+   * Make sure we have pinning for grml-stable and grml-testing
+     repositories via /etc/grml/fai/apt/preferences, not matter where
+     the packages come from (web vs. local mirror/cache for example).
+   * Remove base.tgz from chroot directory.
    * Do not create /etc/sysconfig/network-scripts and
      /etc/sysconfig/provider any longer in cleanup script.
    * Fix typo in bootsplash f3 (thanks, jimmy).

diff --cc etc/grml/fai/config/package_config/GRML_MEDIUM
Simple merge