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);
     }
 
-}
+}

modules/java/check-tests.py

@@ -162,4 +162,3 @@ if __name__ == '__main__':
     print "Not tested methods found:", len(funcs)
     print "Total tests found:", parser.get_tests_count()
     print "Empty test stubs found:", parser.get_empty_stubs_count()
-

modules/java/generator/src/cpp/common.h

@@ -32,4 +32,4 @@
 #  pragma warning(disable:4800 4244)
 #endif
 
-#endif //__JAVA_COMMON_H__
+#endif //__JAVA_COMMON_H__

modules/java/generator/src/cpp/core_manual.cpp

@@ -14,4 +14,4 @@ void cv::setErrorVerbosity(bool verbose)
         cv::redirectError(0);
     else
         cv::redirectError((cv::ErrorCallback)quietCallback);
-}
+}

modules/java/generator/src/cpp/jni_part.cpp

@@ -63,4 +63,4 @@ JNI_OnUnload(JavaVM*, void*)
   //do nothing
 }
 
-} // extern "C"
+} // extern "C"

modules/java/generator/src/cpp/utils.cpp

@@ -158,4 +158,4 @@ JNIEXPORT void JNICALL Java_org_opencv_android_Utils_nMatToBitmap
 
 } // extern "C"
 
-#endif //__ANDROID__
+#endif //__ANDROID__

modules/java/generator/src/java/android+sync.py

@@ -4,4 +4,4 @@ import os
 import shutil
 
 for f in os.listdir("."):
-    shutil.copyfile(f, os.path.join("../../../../../../modules/java/generator/src/java/", "android+" + f));
+    shutil.copyfile(f, os.path.join("../../../../../../modules/java/generator/src/java/", "android+" + f));

modules/java/generator/src/java/engine+OpenCVEngineInterface.aidl

@@ -30,4 +30,4 @@ interface OpenCVEngineInterface
     * @return Returns names of OpenCV libraries, separated by semicolon.
     */
     String getLibraryList(String version);
-}
+}