Merge pull request #2726 from Ilya-Krylov:2.4

author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Thu, 12 Jun 2014 17:37:46 +0000 (21:37 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Thu, 12 Jun 2014 17:37:47 +0000 (21:37 +0400)
author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 12 Jun 2014 17:37:46 +0000 (21:37 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Thu, 12 Jun 2014 17:37:47 +0000 (21:37 +0400)
diff --cc modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
Simple merge
author	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Thu, 12 Jun 2014 17:37:46 +0000 (21:37 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Thu, 12 Jun 2014 17:37:47 +0000 (21:37 +0400)