Merge in preparation of new release.
-rw-r--r-- 17987 COPYING
-rw-r--r-- 1082 COPYRIGHT
-rw-r--r-- 48 Makefile
-rw-r--r-- 217 README
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - man
drwxr-xr-x - obsolete
drwxr-xr-x - src