Merge pull request #1253 from kamjagin:fixingCompilationOnOSX
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 15 Aug 2013 07:54:54 +0000 (11:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 15 Aug 2013 07:54:55 +0000 (11:54 +0400)

Trivial merge