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

modules/legacy/doc/common_interfaces_of_descriptor_extractors.rst

@@ -30,4 +30,4 @@ Wrapping class for computing descriptors by using the
         virtual int descriptorType() const;
     protected:
         ...
-    }
+    }

modules/legacy/doc/common_interfaces_of_generic_descriptor_matchers.rst

@@ -361,4 +361,3 @@ Wrapping class for computing, matching, and classifying descriptors using the
     protected:
             ...
     };
-

modules/legacy/doc/expectation_maximization.rst

@@ -191,4 +191,3 @@ Reads the trained Gaussian mixture model from the file storage.
     :param fs: A file storage with the trained model.
 
     :param node: The parent map. If it is NULL, the function searches a node with parameters in all the top-level nodes (streams), starting with the first one.
-

modules/legacy/doc/histograms.rst

@@ -87,4 +87,3 @@ Returns a pointer to the histogram bin.
 ..
 
 The macros ``GetHistValue`` return a pointer to the specified bin of the 1D, 2D, 3D, or N-D histogram. In case of a sparse histogram, the function creates a new bin and sets it to 0, unless it exists already.
-

modules/legacy/doc/motion_analysis.rst

@@ -78,5 +78,3 @@ Calculates the optical flow for two images using Lucas-Kanade algorithm.
     :param vely: Vertical component of the optical flow of the same size as input images, 32-bit floating-point, single-channel
 
 The function computes the flow for every pixel of the first input image using the Lucas and Kanade algorithm [Lucas81]_. The function is obsolete. To track sparse features, use :ocv:func:`calcOpticalFlowPyrLK`. To track all the pixels, use :ocv:func:`calcOpticalFlowFarneback`.
-
-

modules/legacy/doc/planar_subdivisions.rst

@@ -312,4 +312,3 @@ Inserts a single point into a Delaunay triangulation.
     :param pt: Inserted point.
 
 The function inserts a single point into a subdivision and modifies the subdivision topology appropriately. If a point with the same coordinates exists already, no new point is added. The function returns a pointer to the allocated point. No virtual point coordinates are calculated at this stage.
-