Peter Braden 0840e0b2e2 Merge branch 'provide-cascades' into beta
Conflicts:
	lib/opencv.js
2013-02-26 16:52:36 -08:00
..