Merge branch 'xseg-refactor' into debian
-rw-r--r-- 199 Makefile
drwxr-xr-x - debian
drwxr-xr-x - xseg