Merge pull request #2301 from jet47:fix-nonfree-build
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 7 Feb 2014 11:34:45 +0000 (15:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 7 Feb 2014 11:34:46 +0000 (15:34 +0400)

Trivial merge