Merge pull request #1649 from asandwhich:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 22 Oct 2013 15:16:09 +0000 (19:16 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 22 Oct 2013 15:16:09 +0000 (19:16 +0400)

Trivial merge