Merge pull request #2254 from ilya-lavrenov:opengl
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 3 Feb 2014 08:11:27 +0000 (12:11 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 08:11:28 +0000 (12:11 +0400)

Trivial merge