Merge pull request #1973 from ilya-lavrenov:ocl_haar_sample
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 11 Dec 2013 13:51:36 +0000 (17:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 11 Dec 2013 13:51:36 +0000 (17:51 +0400)

Trivial merge