Merge pull request #1132 from apavlenko:master_ver_290
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 17 Jul 2013 13:51:55 +0000 (17:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 17 Jul 2013 13:51:56 +0000 (17:51 +0400)

Trivial merge