Merge pull request #975 from SpecLad:merge-2.4

author Roman Donchenko <roman.donchenko@itseez.com>

Tue, 11 Jun 2013 13:28:26 +0000 (17:28 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Tue, 11 Jun 2013 13:28:26 +0000 (17:28 +0400)
author Roman Donchenko <roman.donchenko@itseez.com>
Tue, 11 Jun 2013 13:28:26 +0000 (17:28 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Tue, 11 Jun 2013 13:28:26 +0000 (17:28 +0400)
diff --cc samples/gpu/driver_api_multi.cpp
Simple merge
diff --cc samples/gpu/driver_api_stereo_multi.cpp
Simple merge
author	Roman Donchenko <roman.donchenko@itseez.com>
	Tue, 11 Jun 2013 13:28:26 +0000 (17:28 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Tue, 11 Jun 2013 13:28:26 +0000 (17:28 +0400)
		1	2
samples/gpu/driver_api_multi.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
samples/gpu/driver_api_stereo_multi.cpp	patch \|	diff1 \|	diff2 \|	blob \| history