moved from Mac
Merge branch 'master' of github.com:happyhacker/Phorcys