Merge commit 'jrollins/master'

diff --cc doc/george/changelog
index 23ff007f8ef5a6c30c9886100721ca1af23282db,ab97bf373015f2d957095ab042f9633d6a27a606..aefbf7fe7c87da22a9fb057862b6681f2affd025
--- 1/doc/george/changelog
--- 2/doc/george/changelog
+++ b/doc/george/changelog
@@@ -7,10 -7,18 +7,21 @@@
  *  changes to this system                                                  *
  ******************************************************************************
  
 -200r-06-20 - dkg
 +2008-06-22 - dkg
 +      * installed screen (mjgoins and i were collaborating)
 +      
+ 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
+       /etc/default/ssh in order to make this error go away:
+       "error writing /proc/self/oom_adj: Operation not permitted"
+       (c.f. Debian #487325)
+         
 +2008-06-20 - dkg
        * touched /etc/environment to get rid of some spurious auth.log
        entries.
        * turned up sshd's LogLevel from INFO to DEBUG