Merge branch 'master' into rewrite
-rw-r--r-- 53 Makefile.am
-rwxr-xr-x 853 autogen.sh
-rw-r--r-- 2975 configure.ac
drwxr-xr-x - data
drwxr-xr-x - po
drwxr-xr-x - src