Merge branches

diff --cc debian/changelog
index 622cb5b,7ddcbb5..69483ce
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -13,10 -13,12 +13,16 @@@ grml-live (0.0.5) unstable; urgency=lo
      This has been integrated in a new class named "RELEASE".
    * Added support for new kernel version 2.6.23-grml to
      GRML_FULL.
 +  * Use uxterm as x-terminal-emulator and fall back to xterm
 +    only it uxterm is not available.
 +  * Support /etc/locale.gen.grml - it's used by default in
 +    class GRML_FULL and a new class named LOCALES.
+   * New class SID - /etc/grml/fai/config/package_config/SID:
+     - this class is used for packages that are known to cause
+       problems with Debian/etch but work with Debian/sid
+   * Do not exit with an error code if /usr/include/linux is NOT
+     a symlink to /usr/src/linux/include/linux but keep it as
+     a warning instead.
    * Re-enable problematic packages that have been fixed:
      - apt-listbugs (fixed via manual interaction in scripts)
      - gsm-utils (#353967)