elliotwoods Merge branch 'master' of github.com:elliotwoods/artandcode.Camera-and…
6606435 Dec 2, 2011
Merge branch 'master' of github.com:elliotwoods/artandcode.Camera-and…
…-projector-calibration

Conflicts:
	PointcloudWriter/src/testApp.cpp
	common src/ofxKinectPointcloudRecorder.cpp
6606435