Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial

This commit is contained in:
Dan
2015-11-10 12:29:51 -05:00