Merge branches

diff --git a/debian/changelog b/debian/changelog
index 00ce1b4..fe386f9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ grml-live (0.0.5) unstable; urgency=low
   * 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

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 73512b3..8a62305 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -211,6 +211,7 @@ abcde
 abook
 acct
 ace-of-penguins
+ack-grep
 acl
 acpi
 acpi-support
@@ -1081,6 +1082,7 @@ magicrescue
 mailcheck
 maildirsync
 mailfilter
+mailplate
 mailx
 mairix
 make