Merge pull request #2799 from 23pointsNorth:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 12 Jun 2014 17:40:53 +0000 (21:40 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 12 Jun 2014 17:40:53 +0000 (21:40 +0400)

Trivial merge