Merge pull request #2714 from asmorkalov:ocv_cmake_config
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 12 May 2014 14:53:10 +0000 (18:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 12 May 2014 14:53:10 +0000 (18:53 +0400)

Trivial merge