Merge pull request #2919 from larshg:Openni2Support
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 23 Jul 2014 11:23:48 +0000 (11:23 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 23 Jul 2014 11:23:48 +0000 (11:23 +0000)

Trivial merge