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/ml/doc/decision_trees.rst

@@ -318,4 +318,3 @@ decision tree.
 
 
 .. [Breiman84] Breiman, L., Friedman, J. Olshen, R. and Stone, C. (1984), *Classification and Regression Trees*, Wadsworth.
-

modules/ml/doc/neural_networks.rst

@@ -278,4 +278,3 @@ Returns neurons weights of the particular layer.
 .. ocv:function:: double* CvANN_MLP::get_weights(int layer)
 
     :param layer: Index of the particular layer.
-

modules/ml/doc/statistical_models.rst

@@ -161,4 +161,3 @@ Predicts the response for a sample.
 The method is used to predict the response for a new sample. In case of a classification, the method returns the class label. In case of a regression, the method returns the output function value. The input sample must have as many components as the ``train_data`` passed to ``train`` contains. If the ``var_idx`` parameter is passed to ``train``, it is remembered and then is used to extract only the necessary components from the input sample in the method ``predict``.
 
 The suffix ``const`` means that prediction does not affect the internal model state, so the method can be safely called from within different threads.
-

modules/ml/src/ertrees.cpp

@@ -1852,4 +1852,3 @@ bool CvERTrees::train( const Mat& _train_data, int _tflag,
 }
 
 // End of file.
-

modules/ml/src/knearest.cpp

@@ -116,7 +116,7 @@ bool CvKNearest::train( const CvMat* _train_data, const CvMat* _responses,
 
     if( !responses )
         CV_ERROR( CV_StsNoMem, "Could not allocate memory for responses" );
-        
+
     if( _update_base && _dims != var_count )
         CV_ERROR( CV_StsBadArg, "The newly added data have different dimensionality" );
 
@@ -480,4 +480,3 @@ float CvKNearest::find_nearest( const cv::Mat& _samples, int k, CV_OUT cv::Mat&
 }
 
 /* End of file */
-

modules/ml/src/nbayes.cpp

@@ -623,4 +623,3 @@ float CvNormalBayesClassifier::predict( const Mat& _samples, Mat* _results ) con
 }
 
 /* End of file. */
-

modules/ml/src/svm.cpp

@@ -2998,4 +2998,3 @@ cvTrainSVM_CrossValidation( const CvMat* train_data, int tflag,
 #endif
 
 /* End of file. */
-

modules/ml/test/test_emknearestkmeans.cpp

@@ -678,4 +678,3 @@ TEST(ML_KNearest, accuracy) { CV_KNearestTest test; test.safe_run(); }
 TEST(ML_EM, accuracy) { CV_EMTest test; test.safe_run(); }
 TEST(ML_EM, save_load) { CV_EMTest_SaveLoad test; test.safe_run(); }
 TEST(ML_EM, classification) { CV_EMTest_Classification test; test.safe_run(); }
-