Merge pull request #873 from prclibo:2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 13 May 2013 17:06:54 +0000 (21:06 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 13 May 2013 17:06:54 +0000 (21:06 +0400)

Trivial merge