Merge from mainline.
treed54ea8c667fac13e108024adbbfbfc6424843129
-rw-r--r-- 1048 .bzrignore
-rw-r--r-- 557 .dir-locals.el
-rw-r--r-- 108 .gitignore
-rw-r--r-- 949 BUGS
-rw-r--r-- 35147 COPYING
-rw-r--r-- 264955 ChangeLog
-rw-r--r-- 34014 INSTALL
-rw-r--r-- 2798 INSTALL.BZR
-rw-r--r-- 34905 Makefile.in
-rw-r--r-- 5215 README
drwxr-xr-x - admin
-rwxr-xr-x 277 autogen.sh
-rw-r--r-- 11890 config.bat
-rwxr-xr-x 44702 config.guess
-rwxr-xr-x 34334 config.sub
-rwxr-xr-x 452397 configure
-rw-r--r-- 125061 configure.in
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - info
-rwxr-xr-x 5577 install-sh
drwxr-xr-x - leim
drwxr-xr-x - lib-src
drwxr-xr-x - lisp
drwxr-xr-x - lwlib
drwxr-xr-x - m4
-rwxr-xr-x 17053 make-dist
-rwxr-xr-x 3277 mkinstalldirs
-rwxr-xr-x 129 move-if-change
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 1721 update-subdirs
-rw-r--r-- 269 vpath.sed