Merge pull request #2157 from k0da:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 17 Jan 2014 15:00:19 +0000 (19:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 17 Jan 2014 15:00:19 +0000 (19:00 +0400)

Trivial merge