Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 21 Nov 2013 08:03:01 +0000 (12:03 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 21 Nov 2013 08:03:02 +0000 (12:03 +0400)

Trivial merge