Merge commit 'micah/master'

diff --cc doc/zimmerman/changelog
index e119e232a69eeb2fe6ba722e86911982d895ecc1,a92198ca9e284f49b9e927c75f51a09e5821b980..e833b1e195930af594b2cb607e08d11f3f13a964
--- 1/doc/zimmerman/changelog
--- 2/doc/zimmerman/changelog
+++ b/doc/zimmerman/changelog
@@@ -12,7 -12,5 +12,8 @@@
        * aptitude install sks
        * cd /var/lib/sks/dump ; wget -q -r -np -nd -A bz2,SHA256,asc \
          http://nynex.net/keydump/ -e robots=off
+       * install monkeysphere 0.21-2 package
  
 +2008-11-15 - jamie
 +  * aptitude install esmtp-run mailx
 +      * edited /etc/esmtp-run, configured to relay to bulk.mayfirst.org