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/java/android_test/.gitignore

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

modules/java/android_test/AndroidManifest.xml

@@ -4,7 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
     
-	<uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="8" />
 
     <!-- We add an application tag here just so that we can indicate that
          this package needs to link against the android.test library,

modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java

@@ -1932,4 +1932,4 @@ public class ImgprocTest extends OpenCVTestCase {
         assertMatEqual(truth, markers);
     }
 
-}
+}