Merge branches

diff --combined debian/changelog
index 73ebe67,04f235f..398d51b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,7 +1,13 @@@
  grml-live (0.2) unstable; urgency=low
  
    * Update isolinux.bin to version 3.55-1.
 -  * Add loop-aes-testsuite to GRML_FULL.
 +  * Add new packages to GRML_FULL:
 +    - auctex
 +    - loop-aes-testsuite
 +  * Add new packages to GRML_MEDIUM:
 +    - atl2-modules-2.6.23-grml
 +    - madwifi-modules-2.6.23-grml[64]
 +    - madwifi-tools
    * Set 'confirm=1' in /etc/apt/listchanges.conf.
    * Add /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
      for providing default /etc/default/loadcpufreq configuration.
@@@ -21,6 -15,8 +21,8 @@@ grml-live (0.1) unstable; urgency=lo
  
    * Bump version number to 0.1 as we ship grml-live with the
      upcoming stable versions.
+   * Source /etc/grml/grml-live.local before parsing command line
+     options to be able to override configuration on the commandline.
    * Use /usr/bin/vim.tiny as alternativ for vi.
    * Add new packages to GRML_FULL:
      - at76-usb-modules-2.6.23-grml64