Merge from trunk and resolve conflicts.
tree347b37fc39d0db9cd23b3e9f79ee81b4bbc40f08
-rw-r--r-- 706 .dir-locals.el
-rw-r--r-- 264 .gitignore
-rw-r--r-- 932 BUGS
-rw-r--r-- 35147 COPYING
-rw-r--r-- 456980 ChangeLog
-rw-r--r-- 2799 GNUmakefile
-rw-r--r-- 35499 INSTALL
-rw-r--r-- 3277 INSTALL.REPO
-rw-r--r-- 41074 Makefile.in
-rw-r--r-- 5891 README
drwxr-xr-x - admin
-rwxr-xr-x 5844 autogen.sh
drwxr-xr-x - build-aux
-rw-r--r-- 13573 config.bat
-rw-r--r-- 176919 configure.ac
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - leim
drwxr-xr-x - lib-src
drwxr-xr-x - lib
drwxr-xr-x - lisp
drwxr-xr-x - lwlib
drwxr-xr-x - m4
-rwxr-xr-x 17563 make-dist
drwxr-xr-x - msdos
drwxr-xr-x - nextstep
drwxr-xr-x - nt
drwxr-xr-x - oldXMenu
drwxr-xr-x - src
drwxr-xr-x - test