On the 1.6.x-r39887 branch, merge r39887 from trunk and resolve1.6.x-r398871.6.x-r39887
treecdbdac36c3bd265e720ec1d46bf686a6c368af31
-rw-r--r-- 107 BUGS
-rw-r--r-- 159996 CHANGES
-rw-r--r-- 10964 COMMITTERS
-rw-r--r-- 2787 COPYING
-rw-r--r-- 113 HACKING
-rw-r--r-- 67368 INSTALL
-rw-r--r-- 30266 Makefile.in
-rw-r--r-- 2197 README
-rw-r--r-- 6947 STATUS
-rw-r--r-- 9734 TRANSLATING
-rw-r--r-- 1171 aclocal.m4
-rwxr-xr-x 5463 autogen.sh
-rw-r--r-- 31893 build.conf
drwxr-xr-x - build
-rw-r--r-- 34337 configure.ac
drwxr-xr-x - contrib
drwxr-xr-x - doc
-rwxr-xr-x 9346 gen-make.py
drwxr-xr-x - notes
drwxr-xr-x - packages
drwxr-xr-x - subversion
drwxr-xr-x - tools
-rw-r--r-- 20450 win-tests.py
drwxr-xr-x - www