Merge in revision 18673. Summary of change:1.3.x-svnmerge.py1.3.x-svnmerge.py
treea5f16710d51c4274c48722c7f54c67a9b1d1a111
-rw-r--r-- 107 BUGS
-rw-r--r-- 102837 CHANGES
-rw-r--r-- 7726 COMMITTERS
-rw-r--r-- 2745 COPYING
-rw-r--r-- 113 HACKING
-rw-r--r-- 50534 INSTALL
-rw-r--r-- 25858 Makefile.in
-rw-r--r-- 5371 README
-rw-r--r-- 4334 STATUS
-rw-r--r-- 9310 TRANSLATING
drwxr-xr-x - ac-helpers
-rw-r--r-- 808 aclocal.m4
-rwxr-xr-x 5121 autogen.sh
-rw-r--r-- 23934 build.conf
drwxr-xr-x - build
-rw-r--r-- 24031 configure.in
drwxr-xr-x - contrib
-rwxr-xr-x 10723 dist.sh
drwxr-xr-x - doc
-rwxr-xr-x 7070 gen-make.py
drwxr-xr-x - notes
drwxr-xr-x - packages
drwxr-xr-x - subversion
-rw-r--r-- 3537 svn-config.in
drwxr-xr-x - tools
-rw-r--r-- 8451 win-tests.py
drwxr-xr-x - www