Merge pull request #631 from bitwangyaoyao:2.4_stereo
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 15 Mar 2013 06:34:27 +0000 (10:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 15 Mar 2013 06:34:27 +0000 (10:34 +0400)

Trivial merge