Merge commit '43aec5ad' into merge-2.4

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

samples/c/example_cmake/CMakeLists.txt

@@ -13,6 +13,3 @@ ADD_EXECUTABLE(opencv_example  minarea.c)
 TARGET_LINK_LIBRARIES(opencv_example ${OpenCV_LIBS})
 
 #MESSAGE(STATUS "OpenCV_LIBS: ${OpenCV_LIBS}")
-
-
-

samples/c/example_cmake/minarea.c

@@ -114,4 +114,3 @@ int main( int argc, char** argv )
 #ifdef _EiC
 main(1,"convexhull.c");
 #endif
-