Merge branch 'master' of github.com:OpenKinect/libfreenect
Merge branch 'master' of github.com:floe/libfreenect

Conflicts:
	src/cameras.c