Merge pull request #2506 from apavlenko:lbp_ocl_use_any_device
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 21 Mar 2014 14:24:36 +0000 (18:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 21 Mar 2014 14:24:36 +0000 (18:24 +0400)

Trivial merge