Merge commit 'micah/master'

diff --git a/doc/george/changelog b/doc/george/changelog
index 22807d1410a5cd4c6d3bb2a26b486268b736e2de..ab97bf373015f2d957095ab042f9633d6a27a606 100644 (file)
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,6 +7,10 @@
 *  changes to this system                                                   *
 ******************************************************************************
 
+2008-06-21 - micah
+       * Restored /etc/init.d/ssh to original package state and changed
+       /etc/default/ssh to have 'unset SSHD_OOM_ADJUST' instead.
+       
 2008-06-20 - micah
        * Commented out the 'export SSHD_OOM_ADJUST=-17' from the
        /etc/init.d/ssh initscript, and the 'SSHD_OOM_ADJUST=-17' from