Merge pull request #1374 from zacstewart:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 30 Aug 2013 13:28:51 +0000 (17:28 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 30 Aug 2013 13:28:51 +0000 (17:28 +0400)

Trivial merge