Merge pull request #2850 from Sekunde:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 12 Jun 2014 17:38:41 +0000 (21:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 12 Jun 2014 17:38:41 +0000 (21:38 +0400)

Trivial merge