threads
Merge branch 'master' of https://github.com/jglasse/kogeto

Conflicts:
	Joey/src/com/kogeto/joey/capture/FrameProcessor.java