Merge branch 'mirbsd'

diff --cc MINOR-BUGS
index 0ed8eef,782d2ba..55655f5
--- 1/MINOR-BUGS
--- 2/MINOR-BUGS
+++ b/MINOR-BUGS
@@@ -61,12 -61,10 +61,10 @@@ particular reason to think the bug is f
    function?
  
  
 -Note that it is the opinion of the MirBSD founder that the CVSROOT
 +Note that it is the opinion of the Debian maintainer that the CVSROOT
  environment variable ought to *never* be set at all. This prevents
- a lot of trouble. Almost all CVS tutorials are perceived bogus.
- 
- This version appears to have trouble with the testsuite for write
- proxies. Other than that, everything appears to work well.
+ a lot of trouble. Almost all CVS tutorials stating otherwise (or
+ recommending pserver) are perceived bogus.
  
  "cvs annotate -b" does not do what people would expect, I think,
  but neither does it do that under MidnightBSD/DragonFly, where

diff --cc src/import.c
Simple merge

diff --cc src/login.c
Simple merge

diff --cc src/main.c
Simple merge