merged Brian and Adams changes
-rw-r--r-- 12353 Makefile
drwxr-xr-x - doc
drwxr-xr-x - src
drwxr-xr-x - upstream