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/objdetect/src/_lsvm_tbbversion.h

@@ -48,4 +48,4 @@ int tbbTasksThresholdFunctionalScore(const CvLSVMFilterObject **filters, const i
                                      int *kPoints,
                                      CvPoint ****partsDisplacement);
 
-#endif
+#endif

modules/objdetect/src/cascadedetect.hpp

@@ -487,4 +487,3 @@ inline int predictCategoricalStump( CascadeClassifier& cascade, Ptr<FeatureEvalu
     return 1;
 }
 }
-

modules/objdetect/src/featurepyramid.cpp

@@ -512,4 +512,4 @@ int getFeaturePyramid(IplImage * image, CvLSVMFeaturePyramid **maps)
     }
 
     return LATENT_SVM_OK;
-}
+}

modules/objdetect/src/fft.cpp

@@ -244,4 +244,3 @@ int fftInverse2d(float *x_in, float *x_out, int numRows, int numColls)
     free(x_outTmp);
     return FFT_OK;
 }
-

modules/objdetect/src/haar.cpp

@@ -1965,10 +1965,10 @@ cvLoadHaarClassifierCascade( const char* directory, CvSize orig_window_size )
 
     size += (n+1)*sizeof(char*);
     const char** input_cascade = (const char**)cvAlloc( size );
-    
+
     if( !input_cascade )
       CV_Error( CV_StsNoMem, "Could not allocate memory for input_cascade" );
-      
+
     char* ptr = (char*)(input_cascade + n + 1);
 
     for( int i = 0; i < n; i++ )
@@ -1989,7 +1989,7 @@ cvLoadHaarClassifierCascade( const char* directory, CvSize orig_window_size )
     }
 
     input_cascade[n] = 0;
-    
+
     CvHaarClassifierCascade* cascade = icvLoadCascadeCART( input_cascade, n, orig_window_size );
 
     if( input_cascade )

modules/objdetect/src/lsvmtbbversion.cpp

@@ -120,4 +120,3 @@ int tbbTasksThresholdFunctionalScore(const CvLSVMFilterObject **filters, const i
     return LATENT_SVM_OK;
 };
 #endif
-