Merge pull request #862 from piponazo:v4lFPS
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 14 May 2013 12:00:28 +0000 (16:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 14 May 2013 12:00:28 +0000 (16:00 +0400)

Trivial merge