Merge pull request #2764 from hbadino:Feature_3692
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 19 May 2014 13:30:18 +0000 (17:30 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 19 May 2014 13:30:18 +0000 (17:30 +0400)

Trivial merge