Merge pull request #670 from Nerei:osx_compilation
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 19 Mar 2013 15:39:08 +0000 (19:39 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 19 Mar 2013 15:39:08 +0000 (19:39 +0400)

Trivial merge