Merge pull request #191 from asmorkalov:custom_cam_init
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 30 Nov 2012 08:53:26 +0000 (12:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 30 Nov 2012 08:53:26 +0000 (12:53 +0400)

Trivial merge