Merge from disorder.4.0

diff --combined README
index 91a78976a990dd28b316896e9ff5c4d5db47327d,a6f6963d7805db327bcc263dc55ae2f03a451fe9..c00580ba24ea275ca8e2a7065f118263b9a3a74d
--- 1/README
--- 2/README
+++ b/README
@@@ -34,9 -34,9 +34,9 @@@ Build dependencies
    libao            0.8.6
    libasound        1.0.13
    libFLAC          1.1.2
 -  GNU C            4.1.2
 -  GNU Make         3.81
 -  GNU Sed          4.1.5
 +  GNU C            4.1.2               }
 +  GNU Make         3.81                } Non-GNU versions will NOT work
 +  GNU Sed          4.1.5               }
    Python           2.4.4               (optional)
    GTK+             2.8.20              (if you want the GTK+ client)
    GLIB             2.12.4              (if you want the GTK+ client)
@@@ -91,7 -91,7 +91,7 @@@ platform, please get in touch
     If configure cannot guess where your web server keeps its HTML documents and
     CGI programs, you may have to tell it, for instance:
  
-      ./configure cgidir=/whatever/cgi-bin httpdir=/whatever/htdocs
+      ./configure cgiexecdir=/whatever/cgi-bin httpdir=/whatever/htdocs
  
     See README.client for setting up a standalone client (or read the
     disobedience man page).