Merge from trunk.
treed0f9e055b6780b64db72c65753a793e1d1a59f66
-rw-r--r-- 557 .dir-locals.el
-rw-r--r-- 168 .gitignore
-rw-r--r-- 949 BUGS
-rw-r--r-- 35147 COPYING
-rw-r--r-- 307475 ChangeLog
-rw-r--r-- 2632 GNUmakefile
-rw-r--r-- 34352 INSTALL
-rw-r--r-- 3520 INSTALL.BZR
-rw-r--r-- 37123 Makefile.in
-rw-r--r-- 5527 README
drwxr-xr-x - admin
-rwxr-xr-x 5477 autogen.sh
drwxr-xr-x - autogen
drwxr-xr-x - build-aux
-rw-r--r-- 13034 config.bat
-rw-r--r-- 127754 configure.in
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - info
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 17545 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
-rwxr-xr-x 1620 update-subdirs
-rw-r--r-- 220 vpath.sed