strange ...
Merge branch 'master' of https://github.com/patriot7/Composite

Conflicts:
	src/platform/linux/module/hijack.c