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

Conflicts:
	modules/contrib/src/inputoutput.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpuarithm/perf/perf_element_operations.cpp
	modules/gpuarithm/src/element_operations.cpp
	modules/ts/src/precomp.hpp

Who knows, maybe the user's Sphinx installation uses a Python we couldn't find.

Most importantly, added support for multiple include directores,
but also did some general cleanup.

Rationale: we already depend on it (e.g. some scripts use print_function).

None of this should be relevant as of CMake 2.8.7.

corrected constants,  changed objdetection.cpp as well

updated objDetection2.cpp as well

fixed headers in objdetection2.cpp

removed useles RNG

fixed buildbot warnings (wow, i like that bot!)

victim of the war on whitespace

fixing buildbot warnings

fixing last buildbot warning, heya .

trying to rebase/squash commits

Rationale: 1.2.3 was a security update, and we should avoid using
versions with known security vulnerabilities.

They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.

There's no reason for it to exist, since it just duplicates the
CMAKE_VERBOSE_MAKEFILE variable.