Merge pull request #660 from Nerei:2.4
authorcuda-geek <marina.kolpakova@itseez.com>
Sun, 17 Mar 2013 19:00:04 +0000 (23:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 17 Mar 2013 19:00:04 +0000 (23:00 +0400)

Trivial merge