Merge pull request #981 from SeninAndrew:ximea_camera_support_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 13 Jun 2013 12:54:45 +0000 (16:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 13 Jun 2013 12:54:45 +0000 (16:54 +0400)

Trivial merge