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/core/doc/basic_structures.rst

@@ -544,7 +544,7 @@ Range
 -----
 .. ocv:class:: Range
 
-Template class specifying a continuous subsequence (slice) of a sequence. 
+Template class specifying a continuous subsequence (slice) of a sequence.
 
 ::
 
@@ -854,7 +854,7 @@ Mat
 ---
 .. ocv:class:: Mat
 
-OpenCV C++ n-dimensional dense array class 
+OpenCV C++ n-dimensional dense array class
 ::
 
     class CV_EXPORTS Mat
@@ -2941,4 +2941,3 @@ The above methods are usually enough for users. If you want to make your own alg
  * Add public virtual method ``AlgorithmInfo* info() const;`` to your class.
  * Add constructor function, ``AlgorithmInfo`` instance and implement the ``info()`` method. The simplest way is to take  http://code.opencv.org/projects/opencv/repository/revisions/master/entry/modules/ml/src/ml_init.cpp as the reference and modify it according to the list of your parameters.
  * Add some public function (e.g. ``initModule_<mymodule>()``) that calls info() of your algorithm and put it into the same source file as ``info()`` implementation. This is to force C++ linker to include this object file into the target application. See ``Algorithm::create()`` for details.
-

modules/core/doc/core.rst

@@ -16,4 +16,3 @@ core. The Core Functionality
     clustering
     utility_and_system_functions_and_macros
     opengl_interop
-

modules/core/doc/dynamic_structures.rst

@@ -1580,4 +1580,3 @@ Gathers all node pointers to a single sequence.
     :param storage: Container for the sequence
 
 The function puts pointers of all nodes reachable from  ``first`` into a single sequence. The pointers are written sequentially in the depth-first order.
-

modules/core/doc/old_basic_structures.rst

@@ -1677,4 +1677,3 @@ For example, `NumPy <http://numpy.scipy.org/>`_ arrays support the array interfa
     (480, 640, 3) 1
 
 .. note:: In the new Python wrappers (**cv2** module) the function is not needed, since cv2 can process  Numpy arrays (and this is the only supported array type).
-