Merge pull request #408 from asmorkalov:giganetix_cams_patch
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 4 Feb 2013 10:56:54 +0000 (14:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 4 Feb 2013 10:56:54 +0000 (14:56 +0400)

Trivial merge