Merge pull request #2738 from kevmitch:2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 19 May 2014 13:33:22 +0000 (17:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 19 May 2014 13:33:22 +0000 (17:33 +0400)

Trivial merge