Merge tag '3.0.0-beta' of https://github.com/Itseez/opencv into tizen-ocl-3.0
authorKevron Rees <kevron.m.rees@intel.com>
Wed, 12 Nov 2014 23:05:31 +0000 (15:05 -0800)
committerKevron Rees <kevron.m.rees@intel.com>
Wed, 12 Nov 2014 23:05:31 +0000 (15:05 -0800)
OpenCV 3.0.0 Beta


Trivial merge