Merge branches

diff --git a/debian/changelog b/debian/changelog
index f2eca27..2319eee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ grml-live (0.1) unstable; urgency=low
     - truecrypt-2.6.23-grml64
     - unsort
   * Add new packages to GRML_MEDIUM:
+    - ntfs-3g
     - truecrypt-2.6.23-grml64
   * templates/boot/grub/menu.lst, templates/boot/isolinux/*.cfg:
     - drop deprecated entries

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index a95ee5d..f4e4a0e 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -151,6 +151,7 @@ netbase
 netcat
 net-tools
 nfs-common
+ntfs-3g
 ntfsprogs
 ntpdate
 nvi