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/android/.gitignore

@@ -4,4 +4,4 @@ build.xml
 local.properties
 proguard-project.txt
 project.properties
-default.properties
+default.properties

samples/android/color-blob-detection/CMakeLists.txt

@@ -4,4 +4,3 @@ add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenC
 if(TARGET ${sample})
   add_dependencies(opencv_android_examples ${sample})
 endif()
-

samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java

@@ -187,4 +187,4 @@ public class ColorBlobDetectionActivity extends Activity implements OnTouchListe
 
         return new Scalar(pointMatRgba.get(0, 0));
     }
-}
+}

samples/android/face-detection/CMakeLists.txt

@@ -10,4 +10,3 @@ add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenC
 if(TARGET ${sample})
   add_dependencies(opencv_android_examples ${sample})
 endif()
-

samples/android/face-detection/jni/Android.mk

@@ -13,4 +13,4 @@ LOCAL_LDLIBS     += -llog -ldl
 
 LOCAL_MODULE     := detection_based_tracker
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)

samples/android/hello-android/main.cpp

@@ -24,4 +24,3 @@ int main(int argc, char* argv[])
 #endif
   return 0;
 }
-

samples/android/native-activity/src/org/opencv/samples/NativeActivity/CvNativeActivity.java

@@ -40,4 +40,4 @@ public class CvNativeActivity extends Activity {
         super.onResume();
         OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback);
     }
-}
+}

samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java

@@ -84,4 +84,4 @@ public class Tutorial3View extends JavaCameraView implements PictureCallback {
         }
 
     }
-}
+}