On the 1.7.x-r1159093 branch, merge r1159098 r1159101 from trunk.1.7.x-r11590931.7.x-r1159093
treedf1635969a38181e7012c273cbccfa173e983ced
-rw-r--r-- 94 BUGS
-rw-r--r-- 186579 CHANGES
-rw-r--r-- 12956 COMMITTERS
-rw-r--r-- 64370 INSTALL
-rw-r--r-- 14214 LICENSE
-rw-r--r-- 34568 Makefile.in
-rw-r--r-- 593 NOTICE
-rw-r--r-- 2254 README
-rw-r--r-- 7255 STATUS
-rw-r--r-- 2028 aclocal.m4
-rwxr-xr-x 6256 autogen.sh
-rw-r--r-- 34702 build.conf
drwxr-xr-x - build
-rw-r--r-- 46675 configure.ac
drwxr-xr-x - contrib
drwxr-xr-x - doc
-rwxr-xr-x 10604 gen-make.py
-rwxr-xr-x 3444 get-deps.sh
drwxr-xr-x - notes
drwxr-xr-x - packages
drwxr-xr-x - subversion
drwxr-xr-x - tools
-rw-r--r-- 27343 win-tests.py