Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/cyrus-sasl

diff --cc .gitignore
index 489d613,e2a19d2..1897701
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -5,11 -3,13 +3,9 @@@ config.cach
  config.log
  config.status
  config.h
- depcomp
  
 -libtool
 -ltmain.sh
 -missing
 -
  .DS_Store
  
- Makefile.in
  Makefile
  
  *.la