Merge pull request #2173 from Nerei:viz
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 20 Jan 2014 14:05:11 +0000 (18:05 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 20 Jan 2014 14:05:11 +0000 (18:05 +0400)

Trivial merge