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/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. */
-