Merge commit 'HEAD'; commit 'origin'
treeeca913145523e3eeefdc3d998d27c4443364af37
-rw-r--r-- 38 Makefile.am
-rwxr-xr-x 56 autogen.sh
-rw-r--r-- 868 configure.ac
drwxr-xr-x - doc
drwxr-xr-x - src