make it happen
Merge branch 'master' of gukk.info:~/develop/eris into develop
makefile work