Merge pull request #1666 from SpecLad:cv-cap-openni
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 22 Oct 2013 15:02:48 +0000 (19:02 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 22 Oct 2013 15:02:48 +0000 (19:02 +0400)

Trivial merge