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/contrib/doc/facerec/facerec_tutorial.rst

@@ -626,5 +626,3 @@ CSV for the AT&T Facedatabase
 .. literalinclude:: etc/at.txt
    :language: none
    :linenos:
-
-

modules/contrib/doc/facerec/index.rst

@@ -30,4 +30,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-

modules/contrib/doc/facerec/src/CMakeLists.txt

@@ -23,4 +23,3 @@ target_link_libraries(facerec_fisherfaces opencv_contrib opencv_core opencv_imgp
 
 add_executable(facerec_lbph facerec_lbph.cpp)
 target_link_libraries(facerec_lbph opencv_contrib opencv_core opencv_imgproc opencv_highgui)
-

modules/contrib/doc/facerec/tutorial/facerec_gender_classification.rst

@@ -231,5 +231,3 @@ Here are some examples:
 +---------------------------------+----------------------------------------------------------------------------+
 | 0.2 (20%), 0.2 (20%), (70,70)   | .. image:: ../img/tutorial/gender_classification/arnie_20_20_70_70.jpg     |
 +---------------------------------+----------------------------------------------------------------------------+
-
-

modules/contrib/doc/facerec/tutorial/facerec_save_load.rst

@@ -44,4 +44,3 @@ And here is the Reconstruction, which is the same as the original:
 
 .. image:: ../img/eigenface_reconstruction_opencv.png
     :align: center
-

modules/contrib/doc/facerec/tutorial/facerec_video_recognition.rst

@@ -205,5 +205,3 @@ Here are some examples:
 +---------------------------------+----------------------------------------------------------------------------+
 | 0.2 (20%), 0.2 (20%), (70,70)   | .. image:: ../img/tutorial/gender_classification/arnie_20_20_70_70.jpg     |
 +---------------------------------+----------------------------------------------------------------------------+
-
-

modules/contrib/doc/stereo.rst

@@ -113,5 +113,3 @@ The method executes the variational algorithm on a rectified stereo pair. See ``
 **Note**:
 
 The method is not constant, so you should not use the same ``StereoVar`` instance from different threads simultaneously.
-
-

modules/contrib/src/adaptiveskindetector.cpp

@@ -286,5 +286,3 @@ void CvAdaptiveSkinDetector::Histogram::mergeWith(CvAdaptiveSkinDetector::Histog
         }
     }
 };
-
-

modules/contrib/src/bowmsctrainer.cpp

@@ -136,4 +136,3 @@ Mat BOWMSCTrainer::cluster(const Mat& _descriptors) const {
 }
 
 }
-

modules/contrib/src/chowliutree.cpp

@@ -287,4 +287,3 @@ bool ChowLiuTree::reduceEdgesToMinSpan(std::list<info>& edges) {
 }
 
 }
-

modules/contrib/src/colortracker.cpp

@@ -132,5 +132,3 @@ Point2f CvMeanShiftTracker::getTrackingCenter()
 {
     return prev_center;
 }
-
-

modules/contrib/src/contrib_init.cpp

@@ -41,4 +41,3 @@
 //M*/
 
 #include "precomp.hpp"
-

modules/contrib/src/detection_based_tracker.cpp

@@ -892,4 +892,3 @@ const cv::DetectionBasedTracker::Parameters& DetectionBasedTracker::getParameter
 }
 
 #endif
-

modules/contrib/src/featuretracker.cpp

@@ -221,4 +221,3 @@ Point2f CvFeatureTracker::getTrackingCenter()
     center.y = (float)(prev_center.y + prev_trackwindow.height/2.0);
     return center;
 }
-

modules/contrib/src/fuzzymeanshifttracker.cpp

@@ -721,4 +721,3 @@ void CvFuzzyMeanShiftTracker::track(IplImage *maskImage, IplImage *depthMap, int
                 searchMode = tsTracking;
     }
 };
-

modules/contrib/src/hybridtracker.cpp

@@ -233,4 +233,3 @@ void CvHybridTracker::updateTrackerWithLowPassFilter(Mat) {
 Rect CvHybridTracker::getTrackingWindow() {
     return prev_window;
 }
-

modules/contrib/src/lda.cpp

@@ -1106,4 +1106,3 @@ Mat LDA::reconstruct(InputArray src) {
 }
 
 }
-

modules/contrib/src/logpolar_bsm.cpp

@@ -649,4 +649,3 @@ LogPolar_Adjacent::~LogPolar_Adjacent()
 }
 
 }
-

modules/contrib/src/stereovar.cpp

@@ -408,4 +408,4 @@ void StereoVar::operator ()( const Mat& left, const Mat& right, Mat& disp )
 
     u.release();
 }
-} // namespace
+} // namespace

modules/contrib/test/test_precomp.hpp

@@ -14,4 +14,3 @@
 #include <iostream>
 
 #endif
-