Merge pull request #1222 from philippefoubert:branch_2.4_pvapi

author Andrey Pavlenko <andrey.pavlenko@itseez.com>

Mon, 5 Aug 2013 06:20:24 +0000 (10:20 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Mon, 5 Aug 2013 06:20:25 +0000 (10:20 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 5 Aug 2013 06:20:24 +0000 (10:20 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Mon, 5 Aug 2013 06:20:25 +0000 (10:20 +0400)
diff --cc cmake/OpenCVFindLibsVideo.cmake
Simple merge
diff --cc modules/highgui/CMakeLists.txt
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Mon, 5 Aug 2013 06:20:24 +0000 (10:20 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Mon, 5 Aug 2013 06:20:25 +0000 (10:20 +0400)
		1	2
cmake/OpenCVFindLibsVideo.cmake	patch \|	diff1 \|	diff2 \|	blob \| history
modules/highgui/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history