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

samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp

@@ -168,5 +168,3 @@ void MyLine( Mat img, Point start, Point end )
     thickness,
     lineType );
 }
-
-

samples/cpp/tutorial_code/core/discrete_fourier_transform/discrete_fourier_transform.cpp

@@ -75,4 +75,4 @@ int main(int argc, char ** argv)
     waitKey();
 
     return 0;
-}
+}

samples/cpp/tutorial_code/core/file_input_output/file_input_output.cpp

@@ -151,4 +151,4 @@ int main(int ac, char** av)
         << "Tip: Open up " << filename << " with a text editor to see the serialized data." << endl;
 
     return 0;
-}
+}

samples/cpp/tutorial_code/core/how_to_scan_images/how_to_scan_images.cpp

@@ -214,4 +214,4 @@ Mat& ScanImageAndReduceRandomAccess(Mat& I, const uchar* const table)
     }
 
     return I;
-}
+}

samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp

@@ -84,4 +84,4 @@ void Sharpen(const Mat& myImage,Mat& Result)
     Result.row(Result.rows-1).setTo(Scalar(0));
     Result.col(0).setTo(Scalar(0));
     Result.col(Result.cols-1).setTo(Scalar(0));
-}
+}

samples/cpp/tutorial_code/core/mat_the_basic_image_container/mat_the_basic_image_container.cpp

@@ -82,4 +82,4 @@ int main(int,char**)
 
     cout << "A vector of 2D Points = " << vPoints << endl << endl;
     return 0;
-}
+}